Mercurial > hg-stable
changeset 13129:873c032c81b5
Merge with stable
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Mon, 13 Dec 2010 12:19:26 -0600 |
| parents | ece1c069ddd6 (current diff) dbc546811dd6 (diff) |
| children | f139f34ba330 |
| files | mercurial/util.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py Mon Dec 13 11:53:17 2010 +0100 +++ b/mercurial/util.py Mon Dec 13 12:19:26 2010 -0600 @@ -391,7 +391,8 @@ return '1' return str(val) origcmd = cmd - if os.name == 'nt': + if os.name == 'nt' and sys.version_info < (2, 7, 1): + # Python versions since 2.7.1 do this extra quoting themselves cmd = '"%s"' % cmd env = dict(os.environ) env.update((k, py2shell(v)) for k, v in environ.iteritems())