Changeset 382 for python

Timestamp:

Mar 13, 2014, 9:52:20 PM (11 years ago)

Author:

dmik

Message:

Make util.change_root ignore empty new_root argument.

The makefile does --root=$(DESTDIR) and this caused new_root
to be "" when DESTDIR is not set. This caused setup.py to install
files to the local tree instead of the desired PREFIX.

File:

• python/trunk/Lib/distutils/util.py (modified) (1 diff)

python/trunk/Lib/distutils/util.py

@@ -218 +218 @@
     two, which is tricky on DOS/Windows and Mac OS.
     """
+    if new_root is None or new_root == '':
+        return pathname
+
     if os.name == 'posix':
         if not os.path.isabs(pathname):