Package: mercurial / 4.9-2

for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Author: Javi Merino <vicho@debian.org>
Description: Don't rm /usr/bin/python when running the testsuite
 mercurial tries to delete /usr/bin/python when running the testsuite
 with "make tests TESTFLAGS=--with-hg=/usr/bin/hg".  If you're doing
 it as a user, the testsuite fails because it can't remove it.
 .
 This fixes it at least in Debian.  I'm unsure about other systems.
Bug: http://bz.selenic.com/show_bug.cgi?id=4045

--- mercurial.orig/tests/run-tests.py
+++ mercurial/tests/run-tests.py
@@ -2996,7 +2996,7 @@ class TestRunner(object):
                  sys.executable)
             mypython = os.path.join(self._tmpbindir, pyexename)
             try:
-                if os.readlink(mypython) == sys.executable:
+                if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
                     return
                 os.unlink(mypython)
             except OSError as err: