Show More
@@ -689,7 +689,7 b' def checklink(path):' | |||||
689 | """check whether the given path is on a symlink-capable filesystem""" |
|
689 | """check whether the given path is on a symlink-capable filesystem""" | |
690 | # mktemp is not racy because symlink creation will fail if the |
|
690 | # mktemp is not racy because symlink creation will fail if the | |
691 | # file already exists |
|
691 | # file already exists | |
692 | name = tempfile.mktemp(dir=path) |
|
692 | name = tempfile.mktemp(dir=path, prefix='hg-checklink-') | |
693 | try: |
|
693 | try: | |
694 | os.symlink(".", name) |
|
694 | os.symlink(".", name) | |
695 | os.unlink(name) |
|
695 | os.unlink(name) |
@@ -852,6 +852,11 b' def main():' | |||||
852 | os.environ['GREP_OPTIONS'] = '' |
|
852 | os.environ['GREP_OPTIONS'] = '' | |
853 | os.environ['http_proxy'] = '' |
|
853 | os.environ['http_proxy'] = '' | |
854 |
|
854 | |||
|
855 | # unset env related to hooks | |||
|
856 | for k in os.environ.keys(): | |||
|
857 | if k.startswith('HG_'): | |||
|
858 | del os.environ[k] | |||
|
859 | ||||
855 | global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE |
|
860 | global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE | |
856 | TESTDIR = os.environ["TESTDIR"] = os.getcwd() |
|
861 | TESTDIR = os.environ["TESTDIR"] = os.getcwd() | |
857 | if options.tmpdir: |
|
862 | if options.tmpdir: |
General Comments 0
You need to be logged in to leave comments.
Login now