diff options
| -rwxr-xr-x | bin/emerge | 14 | ||||
| -rw-r--r-- | pym/portage_util.py | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/bin/emerge b/bin/emerge index 88940f177..bd0e58b42 100755 --- a/bin/emerge +++ b/bin/emerge @@ -45,6 +45,7 @@ import portage_util import portage_locks import portage_exception from portage_data import secpass +from portage_util import normalize_path as normpath if not hasattr(__builtins__, "set"): from sets import Set as set @@ -111,19 +112,6 @@ class stdout_spinner(object): def update_quiet(self): return - - -def normpath(mystr): - """ - os.path.normpath("//foo") returns "//foo" instead of "/foo" - We dislike this behavior so we create our own normpath func - to fix it. - """ - if mystr and (mystr[0]=='/'): - return os.path.normpath("///"+mystr) - else: - return os.path.normpath(mystr) - def userquery(prompt, responses=None, colours=None): """Displays a prompt and a set of responses, then waits for a response which is checked against the responses and the first to match is diff --git a/pym/portage_util.py b/pym/portage_util.py index 40bdcb9cf..cc5a566b8 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -32,6 +32,11 @@ def writemsg_stdout(mystr,noiselevel=0): writemsg(mystr, noiselevel=noiselevel, fd=sys.stdout) def normalize_path(mypath): + """ + os.path.normpath("//foo") returns "//foo" instead of "/foo" + We dislike this behavior so we create our own normpath func + to fix it. + """ if mypath.startswith(os.path.sep): # posixpath.normpath collapses 3 or more leading slashes to just 1. return os.path.normpath(2*os.path.sep + mypath) |