equal
deleted
inserted
replaced
900 def _checkhglib(verb): |
900 def _checkhglib(verb): |
901 """Ensure that the 'mercurial' package imported by python is |
901 """Ensure that the 'mercurial' package imported by python is |
902 the one we expect it to be. If not, print a warning to stderr.""" |
902 the one we expect it to be. If not, print a warning to stderr.""" |
903 expecthg = os.path.join(PYTHONDIR, 'mercurial') |
903 expecthg = os.path.join(PYTHONDIR, 'mercurial') |
904 actualhg = _gethgpath() |
904 actualhg = _gethgpath() |
905 if actualhg != expecthg: |
905 if os.path.abspath(actualhg) != os.path.abspath(expecthg): |
906 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n' |
906 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n' |
907 ' (expected %s)\n' |
907 ' (expected %s)\n' |
908 % (verb, actualhg, expecthg)) |
908 % (verb, actualhg, expecthg)) |
909 |
909 |
910 def runchildren(options, tests): |
910 def runchildren(options, tests): |