From: Greg Ward <gward@python.net>
Date: Fri, 22 Sep 2000 01:05:43 +0000 (+0000)
Subject: Fix 'convert_path()' so it returns immediately under Unix -- prevents blowing
X-Git-Tag: v2.0b2~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ec053544cf4849a138e70329ffeec1d6ab93e62;p=thirdparty%2FPython%2Fcpython.git

Fix 'convert_path()' so it returns immediately under Unix -- prevents blowing
up when the pathname starts with '/', which is needed when converting
installation directories in the "install" command.
---

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index b60e39c70935..3f068078548b 100644
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -68,15 +68,15 @@ def convert_path (pathname):
        absolute (starts with '/') or contains local directory separators
        (unless the local separator is '/', of course)."""
 
+    if os.sep == '/':
+        return pathname
     if pathname[0] == '/':
         raise ValueError, "path '%s' cannot be absolute" % pathname
     if pathname[-1] == '/':
         raise ValueError, "path '%s' cannot end with '/'" % pathname
-    if os.sep != '/':
-        paths = string.split (pathname, '/')
-        return apply (os.path.join, paths)
-    else:
-        return pathname
+
+    paths = string.split(pathname, '/')
+    return apply(os.path.join, paths)
 
 # convert_path ()