From f56ee8cd2fa86ba74c3b67b1b4edcb6eca76766b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 19 Jan 2007 02:48:47 +0000 Subject: dump emerge's normpath in favor of portage_util's normalize_path (trunk r5698) svn path=/main/branches/2.1.2/; revision=5720 --- bin/emerge | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'bin/emerge') 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 -- cgit v1.2.3-1-g7c22