diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-01-19 02:48:47 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-01-19 02:48:47 +0000 |
commit | f56ee8cd2fa86ba74c3b67b1b4edcb6eca76766b (patch) | |
tree | 39d707e9c8598a6b0e8445aa4ae53aae0fc11c74 /bin/emerge | |
parent | 4d2bb88cb90e8dba5e343ec9f6cc30b50bc1387a (diff) | |
download | portage-f56ee8cd2fa86ba74c3b67b1b4edcb6eca76766b.tar.gz portage-f56ee8cd2fa86ba74c3b67b1b4edcb6eca76766b.tar.bz2 portage-f56ee8cd2fa86ba74c3b67b1b4edcb6eca76766b.zip |
dump emerge's normpath in favor of portage_util's normalize_path (trunk r5698)v2.1.2-r1
svn path=/main/branches/2.1.2/; revision=5720
Diffstat (limited to 'bin/emerge')
-rwxr-xr-x | bin/emerge | 14 |
1 files changed, 1 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 |