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.
This commit is contained in:
Greg Ward 2000-09-22 01:05:43 +00:00
parent f89259786a
commit 7ec053544c
1 changed files with 5 additions and 5 deletions

View File

@ -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 ()