summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2007-01-18 06:23:12 +0000
committerAlec Warner <antarus@gentoo.org>2007-01-18 06:23:12 +0000
commit3aaee9a7c7ada5d332193213eb88d7b010b76ebd (patch)
tree958f76896b2179de692f449b78577e77839cd481 /bin/emerge
parentadd try finally blocks around locking for news (diff)
downloadportage-multirepo-3aaee9a7c7ada5d332193213eb88d7b010b76ebd.tar.gz
portage-multirepo-3aaee9a7c7ada5d332193213eb88d7b010b76ebd.tar.bz2
portage-multirepo-3aaee9a7c7ada5d332193213eb88d7b010b76ebd.zip
dump emerge's normpath in favor of portage_util's normalize_path
svn path=/main/trunk/; revision=5698
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge14
1 files changed, 1 insertions, 13 deletions
diff --git a/bin/emerge b/bin/emerge
index 95aae5ef..bf29453a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -46,6 +46,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
@@ -112,19 +113,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