portage_const -> portage.const

svn path=/main/branches/prefix/; revision=6366

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index c4ef6d4953a0902f4db113763291b187a805d73b..2ba922472d5b6028284c899c435842f96945109a 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,7 +1,7 @@
 #!@PYTHON@ -O
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: /var/cvsroot/gentoo-src/portage/bin/dispatch-conf,v 1.7.2.10 2005/05/12 15:20:22 jstubbs Exp $
+# $Id: $
 
 #
 # dispatch-conf -- Integrate modified configs, post-emerge
@@ -25,7 +25,7 @@ except ImportError:
        sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 
-import dispatch_conf, portage_const
+import portage.dispatch_conf, portage.const
 from portage.process import find_binary
 
 FIND_EXTANT_CONFIGS  = "find '%s' %s -iname '._cfg????_%s' ! -iname '.*~' ! -iname '.*.bak'"
@@ -38,7 +38,7 @@ oldmask = os.umask(0077)
 SCRATCH_DIR = None
 while SCRATCH_DIR is None:
        try:
-               mydir = portage_const.EPREFIX+"/var/tmp/dispatch-conf."
+               mydir = portage.const.EPREFIX+"/var/tmp/dispatch-conf."
                for x in range(0,8):
                        if int(random() * 3) == 0:
                                mydir += chr(int(65+random()*26.0))
@@ -87,7 +87,7 @@ class dispatch:
                #
 
                for path in config_paths.split ():
-                       path = portage.normalize_path(portage_const.EPREFIX + path)
+                       path = portage.normalize_path(portage.const.EPREFIX + path)
                        try:
                                mymode = os.stat(path).st_mode
                        except OSError:

diff --git a/bin/fix-db.py b/bin/fix-db.py
index 1b258694b1a4c21888034738432539a1f0a5ef6d..3ea0fc602b578f4c9857df85e77c6f64b9c2a2f6 100755 (executable)
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -15,10 +15,10 @@ except ImportError:
 from stat import *
 from portage.output import *
 from portage import lockfile,unlockfile,VDB_PATH,root
-import portage_const
+import portage.const
 
 
-mylog = open(portage_const.EPREFIX+"/var/log/emerge_fix-db.log", "a")
+mylog = open(portage.const.EPREFIX+"/var/log/emerge_fix-db.log", "a")
 def writemsg(msg):
        if msg[-1] != '\n':
                msg += "\n"
@@ -28,7 +28,7 @@ def writemsg(msg):
        mylog.flush()
 
 def fix_global_counter(value):
-       myf = open(portage_const.EPREFIX+"/var/cache/edb/counter")
+       myf = open(portage.const.EPREFIX+"/var/cache/edb/counter")
        newvalue = value+1000
        myf.write(str(newvalue))
        myf.flush()
@@ -40,7 +40,7 @@ counters = {}
 times = {}
 
 try:
-       real_counter = long(open(portage_const.EPREFIX+"/var/cache/edb/counter").read())
+       real_counter = long(open(portage.const.EPREFIX+"/var/cache/edb/counter").read())
 except SystemExit, e:
        raise  # This needs to be propogated
 except:

diff --git a/bin/regenworld b/bin/regenworld
index 1ef2f07434688bc982200b88cd2700475241c100..c93a4118571b88240eecf4778c95058ad96eb4bd 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -10,7 +10,7 @@ except ImportError:
        from os import path as osp
        sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
-import re, portage_const
+import re, portage.const
 
 __candidatematcher__ = re.compile("^[0-9]+: \\*\\*\\* emerge ")
 __noncandidatematcher__ = re.compile(" sync( |$)| clean( |$)| search( |$)|--oneshot|--fetchonly| unmerge( |$)")
@@ -52,7 +52,7 @@ worldlist = portage.grabfile(os.path.join("/", portage.WORLD_FILE))
 syslist = portage.settings.packages
 syslist = filter(issyspkg, syslist)
 
-logfile = portage.grabfile(portage_const.EPREFIX+"/var/log/emerge.log")
+logfile = portage.grabfile(portage.const.EPREFIX+"/var/log/emerge.log")
 biglist = filter(iscandidate, logfile)
 biglist = map(getpkginfo, biglist)
 tmplist = []