Mercurial > hg > mercurial-source
changeset 10903:cd21bf199d17
merge with stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Apr 2010 09:09:43 +0200 |
parents | cf016c9831d1 (current diff) 4eb6311d217a (diff) |
children | 13a1b2fb7ef2 |
files | mercurial/util.py tests/run-tests.py |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py +++ b/mercurial/util.py @@ -689,7 +689,7 @@ """check whether the given path is on a symlink-capable filesystem""" # mktemp is not racy because symlink creation will fail if the # file already exists - name = tempfile.mktemp(dir=path) + name = tempfile.mktemp(dir=path, prefix='hg-checklink-') try: os.symlink(".", name) os.unlink(name)
--- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -852,6 +852,11 @@ os.environ['GREP_OPTIONS'] = '' os.environ['http_proxy'] = '' + # unset env related to hooks + for k in os.environ.keys(): + if k.startswith('HG_'): + del os.environ[k] + global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE TESTDIR = os.environ["TESTDIR"] = os.getcwd() if options.tmpdir: