summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge14
1 files changed, 1 insertions, 13 deletions
diff --git a/bin/emerge b/bin/emerge
index 88940f17..bd0e58b4 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