[gentoo-commits] portage r14157 - main/branches/prefix/bin

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-08-26 09:50:07 +0000 (Wed, 26 Aug 2009)
New Revision: 14157

Modified:
   main/branches/prefix/bin/dispatch-conf
Log:
import EPREFIX from portage.const, bug #282581

Modified: main/branches/prefix/bin/dispatch-conf
===================================================================
--- main/branches/prefix/bin/dispatch-conf	2009-08-26 09:46:57 UTC (rev 14156)
+++ main/branches/prefix/bin/dispatch-conf	2009-08-26 09:50:07 UTC (rev 14157)
@@ -22,6 +22,7 @@
 from portage import os
 from portage import dispatch_conf
 from portage.process import find_binary
+from portage.const import EPREFIX
 
 FIND_EXTANT_CONFIGS  = "find '%s' %s -name '._cfg????_%s' ! -name '.*~' ! -iname '.*.bak' -print"
 DIFF_CONTENTS        = "diff -Nu '%s' '%s'"
@@ -33,7 +34,7 @@
 SCRATCH_DIR = None
 while SCRATCH_DIR is None:
     try:
-        mydir = portage.const.EPREFIX+"/var/tmp/dispatch-conf."
+        mydir = EPREFIX+"/var/tmp/dispatch-conf."
         for x in range(0,8):
             if int(random() * 3) == 0:
                 mydir += chr(int(65+random()*26.0))
@@ -82,7 +83,7 @@
         #
 
         for path in config_paths.split ():
-            path = portage.normalize_path(portage.const.EPREFIX + path)
+            path = portage.normalize_path(EPREFIX + path)
             try:
                 mymode = os.stat(path).st_mode
             except OSError: