Namespace sanitizing, step 3

svn path=/main/trunk/; revision=5782

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 044468fe6ae70fa4a9b51ab0eded4bb4d0a983d4..ffecf034323a1c63019822301a39b654aa373f9f 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -50,7 +50,7 @@ except ImportError:
        bsd_chflags = None
 
 try:
-       from cache.cache_errors import CacheError
+       from portage.cache.cache_errors import CacheError
        import cvstree
        import xpak
        import getbinpkg
@@ -61,7 +61,7 @@ try:
 
        # XXX: This needs to get cleaned up.
        import output
-       from output import bold, colorize, green, red, yellow
+       from portage.output import bold, colorize, green, red, yellow
 
        import portage.const
        from portage.const import VDB_PATH, PRIVATE_PATH, CACHE_PATH, DEPCACHE_PATH, \
@@ -531,7 +531,7 @@ def elog_process(cpv, mysettings):
                try:
                        # FIXME: ugly ad.hoc import code
                        # TODO:  implement a common portage module loader
-                       logmodule = __import__("elog_modules.mod_"+s)
+                       logmodule = __import__("portage.elog_modules.mod_"+s)
                        m = getattr(logmodule, "mod_"+s)
                        def timeout_handler(signum, frame):
                                raise portage.exception.PortageException(
@@ -1044,8 +1044,8 @@ class config:
                        if self.modules["user"] is None:
                                self.modules["user"] = {}
                        self.modules["default"] = {
-                               "portdbapi.metadbmodule": "cache.metadata.database",
-                               "portdbapi.auxdbmodule":  "cache.flat_hash.database",
+                               "portdbapi.metadbmodule": "portage.cache.metadata.database",
+                               "portdbapi.auxdbmodule":  "portage.cache.flat_hash.database",
                        }
 
                        self.usemask=[]
@@ -2503,7 +2503,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                                noiselevel=-1)
                                                                        os.unlink(myfile_path)
                                                        else:
-                                                               eout = output.EOutput()
+                                                               eout = portage.output.EOutput()
                                                                eout.quiet = \
                                                                        mysettings.get("PORTAGE_QUIET", None) == "1"
                                                                for digest_name in mydigests[myfile]:
@@ -2641,7 +2641,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                        os.unlink(mysettings["DISTDIR"]+"/"+myfile)
                                                                        fetched=0
                                                                else:
-                                                                       eout = output.EOutput()
+                                                                       eout = portage.output.EOutput()
                                                                        eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1"
                                                                        for x_key in mydigests[myfile].keys():
                                                                                eout.ebegin("%s %s ;-)" % (myfile, x_key))
@@ -2769,7 +2769,7 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
                                cp = os.path.sep.join(mysettings["O"].split(os.path.sep)[-2:])
                                pkgs = myportdb.cp_list(cp, mytree=mytree)
                                pkgs.sort()
-                               writemsg_stdout("  digest.assumed" + output.colorize("WARN",
+                               writemsg_stdout("  digest.assumed" + portage.output.colorize("WARN",
                                        str(len(auto_assumed)).rjust(18)) + "\n")
                                for pkg_key in pkgs:
                                        fetchlist = myportdb.getfetchlist(pkg_key,
@@ -2818,7 +2818,7 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0):
                if strict:
                        return 0
        mf = Manifest(pkgdir, mysettings["DISTDIR"])
-       eout = output.EOutput()
+       eout = portage.output.EOutput()
        eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1"
        try:
                eout.ebegin("checking ebuild checksums ;-)")
@@ -3051,7 +3051,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
        # Allow color.map to control colors associated with einfo, ewarn, etc...
        mycolors = []
        for c in ("GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
-               mycolors.append("%s=$'%s'" % (c, output.codes[c]))
+               mycolors.append("%s=$'%s'" % (c, portage.output.codes[c]))
        mysettings["PORTAGE_COLORMAP"] = "\n".join(mycolors)
 
 def prepare_build_dirs(myroot, mysettings, cleanup):
@@ -4877,7 +4877,7 @@ class bindbapi(fakedbapi):
                mylist  = []
                tbz2name = mysplit[1]+".tbz2"
                if self.bintree and not self.bintree.isremote(mycpv):
-                       tbz2 = xpak.tbz2(self.bintree.getname(mycpv))
+                       tbz2 = portage.xpak.tbz2(self.bintree.getname(mycpv))
                        getitem = tbz2.getfile
                else:
                        getitem = self.bintree.remotepkgs[tbz2name].get
@@ -4907,10 +4907,10 @@ class bindbapi(fakedbapi):
                tbz2path = self.bintree.getname(cpv)
                if not os.path.exists(tbz2path):
                        raise KeyError(cpv)
-               mytbz2 = xpak.tbz2(tbz2path)
+               mytbz2 = portage.xpak.tbz2(tbz2path)
                mydata = mytbz2.get_data()
                mydata.update(values)
-               mytbz2.recompose_mem(xpak.xpak_mem(mydata))
+               mytbz2.recompose_mem(portage.xpak.xpak_mem(mydata))
 
        def cp_list(self, *pargs, **kwargs):
                if not self.bintree.populated:
@@ -5629,7 +5629,7 @@ class portdbapi(dbapi):
                if self.tmpfs and not os.access(self.tmpfs, os.R_OK):
                        self.tmpfs = None
 
-               self.eclassdb = eclass_cache.cache(self.porttree_root,
+               self.eclassdb = portage.eclass_cache.cache(self.porttree_root,
                        overlays=self.mysettings["PORTDIR_OVERLAY"].split())
 
                self.metadbmodule = self.mysettings.load_best_module("portdbapi.metadbmodule")
@@ -5656,7 +5656,7 @@ class portdbapi(dbapi):
                # ~harring
                filtered_auxdbkeys = filter(lambda x: not x.startswith("UNUSED_0"), auxdbkeys)
                if secpass < 1:
-                       from cache import metadata_overlay, volatile
+                       from portage.cache import metadata_overlay, volatile
                        for x in self.porttrees:
                                db_ro = self.auxdbmodule(self.depcachedir, x,
                                        filtered_auxdbkeys, gid=portage_gid, readonly=True)
@@ -6305,7 +6305,7 @@ class binarytree(object):
 
                        #print ">>> Updating data in:",mycpv
                        writemsg_stdout("%")
-                       mytbz2 = xpak.tbz2(tbz2path)
+                       mytbz2 = portage.xpak.tbz2(tbz2path)
                        mydata = mytbz2.get_data()
                        updated_items = update_dbentries([mylist], mydata)
                        mydata.update(updated_items)
@@ -6314,7 +6314,7 @@ class binarytree(object):
                                mydata[mynewpkg+".ebuild"] = mydata[myoldpkg+".ebuild"]
                                del mydata[myoldpkg+".ebuild"]
                                mydata["PF"] = mynewpkg + "\n"
-                       mytbz2.recompose_mem(xpak.xpak_mem(mydata))
+                       mytbz2.recompose_mem(portage.xpak.xpak_mem(mydata))
 
                        self.dbapi.cpv_remove(mycpv)
                        del self._pkg_paths[mycpv]
@@ -6396,7 +6396,7 @@ class binarytree(object):
                                continue
 
                        #print ">>> Updating data in:",mycpv
-                       mytbz2 = xpak.tbz2(tbz2path)
+                       mytbz2 = portage.xpak.tbz2(tbz2path)
                        mydata = mytbz2.get_data()
 
                        slot = mydata["SLOT"]
@@ -6408,7 +6408,7 @@ class binarytree(object):
 
                        writemsg_stdout("S")
                        mydata["SLOT"] = newslot+"\n"
-                       mytbz2.recompose_mem(xpak.xpak_mem(mydata))
+                       mytbz2.recompose_mem(portage.xpak.xpak_mem(mydata))
                return 1
 
        def update_ents(self, update_iter):
@@ -6425,12 +6425,12 @@ class binarytree(object):
                                continue
                        #print ">>> Updating binary data:",mycpv
                        writemsg_stdout("*")
-                       mytbz2 = xpak.tbz2(tbz2path)
+                       mytbz2 = portage.xpak.tbz2(tbz2path)
                        mydata = mytbz2.get_data()
                        updated_items = update_dbentries(update_iter, mydata)
                        if len(updated_items) > 0:
                                mydata.update(updated_items)
-                               mytbz2.recompose_mem(xpak.xpak_mem(mydata))
+                               mytbz2.recompose_mem(portage.xpak.xpak_mem(mydata))
                return 1
 
        def prevent_collision(self, cpv):
@@ -6449,7 +6449,7 @@ class binarytree(object):
                dest_path = os.path.join(self.pkgdir, mypath)
                if os.path.exists(dest_path):
                        # For invalid packages, other_cat could be None.
-                       other_cat = xpak.tbz2(dest_path).getfile("CATEGORY")
+                       other_cat = portage.xpak.tbz2(dest_path).getfile("CATEGORY")
                        if other_cat:
                                other_cat = other_cat.strip()
                                self._move_from_all(other_cat + "/" + mypkg)
@@ -6517,7 +6517,7 @@ class binarytree(object):
                                        full_path = os.path.join(self.pkgdir, mypath)
                                        if os.path.islink(full_path):
                                                continue
-                                       mytbz2 = xpak.tbz2(full_path)
+                                       mytbz2 = portage.xpak.tbz2(full_path)
                                        # For invalid packages, mycat could be None.
                                        mycat = mytbz2.getfile("CATEGORY")
                                        mypf = mytbz2.getfile("PF")
@@ -6558,7 +6558,7 @@ class binarytree(object):
                                chunk_size = 3000
 
                        writemsg(green("Fetching binary packages info...\n"))
-                       self.remotepkgs = getbinpkg.dir_get_metadata(
+                       self.remotepkgs = portage.getbinpkg.dir_get_metadata(
                                self.settings["PORTAGE_BINHOST"], chunk_size=chunk_size)
                        writemsg(green("  -- DONE!\n\n"))
 
@@ -6640,7 +6640,7 @@ class binarytree(object):
                mysplit=pkgname.split("/")
                if self.isremote(pkgname):
                        return self.remotepkgs[mysplit[1]+".tbz2"]["USE"][:].split()
-               tbz2=xpak.tbz2(self.getname(pkgname))
+               tbz2=portage.xpak.tbz2(self.getname(pkgname))
                return tbz2.getfile("USE").split()
 
        def gettbz2(self,pkgname):
@@ -6659,7 +6659,7 @@ class binarytree(object):
                        os.makedirs(mydest, 0775)
                except (OSError, IOError):
                        pass
-               return getbinpkg.file_get(
+               return portage.getbinpkg.file_get(
                        self.settings["PORTAGE_BINHOST"] + "/" + tbz2name,
                        mydest, fcmd=self.settings["RESUMECOMMAND"])
 
@@ -7879,7 +7879,7 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
                #tbz2_lock = portage.locks.lockfile(mytbz2, wantnewlockfile=1)
 
                mypkg = os.path.basename(mytbz2)[:-5]
-               xptbz2 = xpak.tbz2(mytbz2)
+               xptbz2 = portage.xpak.tbz2(mytbz2)
                mycat = xptbz2.getfile("CATEGORY")
                if not mycat:
                        writemsg("!!! CATEGORY info missing from info chunk, aborting...\n",

diff --git a/pym/portage/cache/anydbm.py b/pym/portage/cache/anydbm.py
index a4e0003d423f463d9220cae8946d49198f749b7b..8d72e40ca9f474e7b01cca9fa3bfe375bfe59763 100644 (file)
--- a/pym/portage/cache/anydbm.py
+++ b/pym/portage/cache/anydbm.py
@@ -9,8 +9,8 @@ try:
 except ImportError:
        import pickle
 import os
-from cache import fs_template
-from cache import cache_errors
+from portage.cache import fs_template
+from portage.cache import cache_errors
 
 
 class database(fs_template.FsBased):

diff --git a/pym/portage/cache/flat_hash.py b/pym/portage/cache/flat_hash.py
index 48e8a175e6ab1347adae4af4477fdaf8b282a753..24998a6d38548cc69b25710ce2a2b520dd0e8cbc 100644 (file)
--- a/pym/portage/cache/flat_hash.py
+++ b/pym/portage/cache/flat_hash.py
@@ -3,10 +3,10 @@
 # License: GPL2
 # $Id$
 
-from cache import fs_template
-from cache import cache_errors
+from portage.cache import fs_template
+from portage.cache import cache_errors
 import errno, os, stat
-from cache.template import reconstruct_eclasses
+from portage.cache.template import reconstruct_eclasses
 # store the current key order *here*.
 class database(fs_template.FsBased):
 

diff --git a/pym/portage/cache/flat_list.py b/pym/portage/cache/flat_list.py
index 85efa4c0214cc7ac56bfd44702be3b282cd126d2..6dbbba96bcc991daad8a272fef1465c0c6e54ba0 100644 (file)
--- a/pym/portage/cache/flat_list.py
+++ b/pym/portage/cache/flat_list.py
@@ -1,5 +1,5 @@
-from cache import fs_template
-from cache import cache_errors
+from portage.cache import fs_template
+from portage.cache import cache_errors
 import errno, os, stat
 
 # store the current key order *here*.

diff --git a/pym/portage/cache/fs_template.py b/pym/portage/cache/fs_template.py
index 1fdfac764f13c2e1fc9b4e0447e9d66ada5d2098..066a96117b8be9899e44eba96e1b6339a0403bca 100644 (file)
--- a/pym/portage/cache/fs_template.py
+++ b/pym/portage/cache/fs_template.py
@@ -4,7 +4,7 @@
 # $Id$
 
 import os
-from cache import template
+from portage.cache import template
 from portage.data import portage_gid
 
 class FsBased(template.database):

diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py
index df039d5e28c2125c3489659708dc4a70cca31ffc..427fc1936663c21cc764d6038dbc5d947813d394 100644 (file)
--- a/pym/portage/cache/metadata.py
+++ b/pym/portage/cache/metadata.py
@@ -4,10 +4,10 @@
 # $Id$
 
 import os, stat, types
-from cache import flat_hash
-import eclass_cache 
-from cache.template import reconstruct_eclasses
-from cache.mappings import ProtectedDict
+from portage.cache import flat_hash
+import portage.eclass_portage.cache 
+from portage.cache.template import reconstruct_eclasses
+from portage.cache.mappings import ProtectedDict
 
 # this is the old cache format, flat_list.  count maintained here.
 magic_line_count = 22
@@ -26,7 +26,7 @@ class database(flat_hash.database):
                loc = location
                super(database, self).__init__(location, *args, **config)
                self.location = os.path.join(loc, "metadata","cache")
-               self.ec = eclass_cache.cache(loc)
+               self.ec = portage.eclass_cache.cache(loc)
 
        def __getitem__(self, cpv):
                return flat_hash.database.__getitem__(self, cpv)

diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py
index d82ba96f8b7542c889a5fab0ac6951aad1f08b76..d1fcda1d1a3d73422357afd870b40035e551da91 100644 (file)
--- a/pym/portage/cache/metadata_overlay.py
+++ b/pym/portage/cache/metadata_overlay.py
@@ -5,10 +5,10 @@
 import time
 if not hasattr(__builtins__, "set"):
        from sets import Set as set
-from cache import template
-from cache.cache_errors import CacheCorruption
-from cache.flat_hash import database as db_rw
-from cache.metadata import database as db_ro
+from portage.cache import template
+from portage.cache.cache_errors import CacheCorruption
+from portage.cache.flat_hash import database as db_rw
+from portage.cache.metadata import database as db_ro
 
 class database(template.database):
 

diff --git a/pym/portage/cache/sql_template.py b/pym/portage/cache/sql_template.py
index e635616e913d09ae2ef4b015924579bc01cbb0c6..4ef3df421e5c620ba4e36745c53ea18fe86fa23f 100644 (file)
--- a/pym/portage/cache/sql_template.py
+++ b/pym/portage/cache/sql_template.py
@@ -3,8 +3,8 @@
 # License: GPL2
 # $Id$
 
-from cache import template, cache_errors
-from cache.template import reconstruct_eclasses
+from portage.cache import template, cache_errors
+from portage.cache.template import reconstruct_eclasses
 
 class SQLDatabase(template.database):
        """template class for RDBM based caches

diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index ee3dde3c74363f6b6e5486185fe8fba5bb7d188e..1cab499787b03ee65721a2c6f63b4a3f385e8637 100644 (file)
--- a/pym/portage/cache/sqlite.py
+++ b/pym/portage/cache/sqlite.py
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-from cache import fs_template
-from cache import cache_errors
+from portage.cache import fs_template
+from portage.cache import cache_errors
 import os
-from cache.template import reconstruct_eclasses
+from portage.cache.template import reconstruct_eclasses
 from portage.util import writemsg, apply_secpass_permissions
 from portage.data import portage_gid
 try:

diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py
index 4ffd9b9efd2a1177271e5a3981a963066976f901..6fe9f3b009fc3777b569e666d6875f7f4dcbd9e0 100644 (file)
--- a/pym/portage/cache/template.py
+++ b/pym/portage/cache/template.py
@@ -3,9 +3,9 @@
 # License: GPL2
 # $Id$
 
-from cache import cache_errors
-from cache.cache_errors import InvalidRestriction
-from cache.mappings import ProtectedDict
+from portage.cache import cache_errors
+from portage.cache.cache_errors import InvalidRestriction
+from portage.cache.mappings import ProtectedDict
 
 class database(object):
        # this is for metadata/cache transfer.

diff --git a/pym/portage/cache/util.py b/pym/portage/cache/util.py
index 6393deef536cb0880294f1393f6d1e925578cc73..025887715f01d8151306a8b60d9636158c9792f6 100644 (file)
--- a/pym/portage/cache/util.py
+++ b/pym/portage/cache/util.py
@@ -6,7 +6,7 @@
 if not hasattr(__builtins__, "set"):
        from sets import Set as set
 from itertools import chain
-from cache import cache_errors
+from portage.cache import cache_errors
 
 def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None, verbose_instance=None):
 
@@ -39,7 +39,7 @@ def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None,
                trg = None
                try:
                        trg = trg_cache[x]
-                       if long(trg["_mtime_"]) == long(entry["_mtime_"]) and eclass_cache.is_eclass_data_valid(trg["_eclasses_"]):
+                       if long(trg["_mtime_"]) == long(entry["_mtime_"]) and portage.eclass_cache.is_eclass_data_valid(trg["_eclasses_"]):
                                write_it = False
                except (cache_errors.CacheError, KeyError):
                        pass
@@ -69,11 +69,11 @@ def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None,
                                        if not "_eclasses_" in entry:
                                                noise.corruption(x,"missing _eclasses_ field")
                                                continue
-                                       if not eclass_cache.is_eclass_data_valid(entry["_eclasses_"]):
+                                       if not portage.eclass_cache.is_eclass_data_valid(entry["_eclasses_"]):
                                                noise.eclass_stale(x)
                                                continue
                                else:
-                                       entry["_eclasses_"] = eclass_cache.get_eclass_data(entry["INHERITED"].split(), \
+                                       entry["_eclasses_"] = portage.eclass_cache.get_eclass_data(entry["INHERITED"].split(), \
                                                from_master_only=True)
                                        if not entry["_eclasses_"]:
                                                noise.eclass_stale(x)

diff --git a/pym/portage/cache/volatile.py b/pym/portage/cache/volatile.py
index 0a204b70fb34ed15c26669311b47489e4d61045a..555eafc5a107af52d728f55770b253700c8c0335 100644 (file)
--- a/pym/portage/cache/volatile.py
+++ b/pym/portage/cache/volatile.py
@@ -5,7 +5,7 @@
 import copy
 if not hasattr(__builtins__, "set"):
        from sets import Set as set
-from cache import template
+from portage.cache import template
 
 class database(template.database):
 

diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py
index 51f8e37bc7fc761b997ffca1b5ae586b750733a7..1a96787ec194bea672dfc447e953e8b48a7b7d01 100644 (file)
--- a/pym/portage/checksum.py
+++ b/pym/portage/checksum.py
@@ -1,4 +1,4 @@
-# portage.checksum.py -- core Portage functionality
+# checksum.py -- core Portage functionality
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 1ed53419c1d45b33f9f5824db1c1326d6445e05d..10a480cd1c684085b2cb424ee9ac5f8d6a8c46a9 100644 (file)
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -1,4 +1,4 @@
-# portage.data.py -- Calculated/Discovered Data Values
+# data.py -- Calculated/Discovered Data Values
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -8,8 +8,8 @@ if not hasattr(__builtins__, "set"):
 
 import os,pwd,grp
 from portage.util import writemsg
-from output import green,red
-from output import create_color_func
+from portage.output import green,red
+from portage.output import create_color_func
 bad = create_color_func("BAD")
 
 ostype=os.uname()[0]

diff --git a/pym/portage/elog_modules/mod_custom.py b/pym/portage/elog_modules/mod_custom.py
index f95e1999aa4d614336932eac0196e0b9ccffb813..5fae84078bdb9dab2a227a7c97fdb138de78e43f 100644 (file)
--- a/pym/portage/elog_modules/mod_custom.py
+++ b/pym/portage/elog_modules/mod_custom.py
@@ -1,7 +1,7 @@
-import elog_modules.mod_save, portage.exec, portage.exception
+import portage.elog_modules.mod_save, portage.process, portage.exception
 
 def process(mysettings, cpv, logentries, fulltext):
-       elogfilename = elog_modules.mod_save.process(mysettings, cpv, logentries, fulltext)
+       elogfilename = portage.elog_modules.mod_save.process(mysettings, cpv, logentries, fulltext)
        
        if (not "PORTAGE_ELOG_COMMAND" in mysettings.keys()) \
                        or len(mysettings["PORTAGE_ELOG_COMMAND"]) == 0:
@@ -10,7 +10,7 @@ def process(mysettings, cpv, logentries, fulltext):
                mylogcmd = mysettings["PORTAGE_ELOG_COMMAND"]
                mylogcmd = mylogcmd.replace("${LOGFILE}", elogfilename)
                mylogcmd = mylogcmd.replace("${PACKAGE}", cpv)
-               retval = portage.exec.spawn_bash(mylogcmd)
+               retval = portage.process.spawn_bash(mylogcmd)
                if retval != 0:
                        raise portage.exception.PortageException("!!! PORTAGE_ELOG_COMMAND failed with exitcode %d" % retval)
        return

diff --git a/pym/portage/emergehelp.py b/pym/portage/emergehelp.py
index 373e0bf444e40ae33604b8aede53460cc01feb22..60ae52c2d0b8ed2dfc5917cbff60fc6b5e7a75e9 100644 (file)
--- a/pym/portage/emergehelp.py
+++ b/pym/portage/emergehelp.py
@@ -4,7 +4,7 @@
 
 
 import os,sys
-from output import bold, turquoise, green
+from portage.output import bold, turquoise, green
 
 def shorthelp():
        print

diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 462da429d27ae766ec9f65183c44eaf53a3a5d60..b0d5ca9eb2097066d50dfee28bcc3696fc0b05f1 100644 (file)
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -6,8 +6,8 @@
 if not hasattr(__builtins__, "set"):
        from sets import Set as set
 
-from output import red, yellow, green
-import htmllib,HTMLParser,formatter,sys,os,xpak,time,tempfile,base64,urllib2
+from portage.output import red, yellow, green
+import htmllib,HTMLParser,formatter,sys,os,portage.xpak,time,tempfile,base64,urllib2
 
 try:
        import cPickle
@@ -32,8 +32,8 @@ def make_metadata_dict(data):
        myid,myglob = data
        
        mydict = {}
-       for x in xpak.getindex_mem(myid):
-               mydict[x] = xpak.getitem(data,x)
+       for x in portage.xpak.getindex_mem(myid):
+               mydict[x] = portage.xpak.getitem(data,x)
 
        return mydict
 
@@ -330,7 +330,7 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000):
                raise TypeError, "Unknown protocol. '%s'" % protocol
        
        if data:
-               xpaksize = xpak.decodeint(data[-8:-4])
+               xpaksize = portage.xpak.decodeint(data[-8:-4])
                if (xpaksize+8) > chunk_size:
                        myid = file_get_metadata(baseurl, conn, (xpaksize+8))
                        if not keepconnection:
@@ -340,7 +340,7 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000):
                        xpak_data = data[len(data)-(xpaksize+8):-8]
                del data
 
-               myid = xpak.xsplit_mem(xpak_data)
+               myid = portage.xpak.xsplit_mem(xpak_data)
                if not myid:
                        myid = None,None
                del xpak_data

diff --git a/pym/portage/gpg.py b/pym/portage/gpg.py
index 7dd758506c8a9d4b8c605a949586504728f8a83f..93335e11b2438678d280cc0dd3c031583d5b82de 100644 (file)
--- a/pym/portage/gpg.py
+++ b/pym/portage/gpg.py
@@ -1,4 +1,4 @@
-# portage.gpg.py -- core Portage functionality
+# gpg.py -- core Portage functionality
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -124,19 +124,19 @@ class FileChecker:
                trustLevel     = UNTRUSTED
                if result == 0:
                        trustLevel   = TRUSTED
-                       #if output.find("WARNING") != -1:
+                       #if portage.output.find("WARNING") != -1:
                        #       trustLevel = MARGINAL
-                       if output.find("BAD") != -1:
+                       if portage.output.find("BAD") != -1:
                                raise portage.exception.InvalidSignature, filename
                elif result == 1:
                        trustLevel   = EXISTS
-                       if output.find("BAD") != -1:
+                       if portage.output.find("BAD") != -1:
                                raise portage.exception.InvalidSignature, filename
                elif result == 2:
                        trustLevel   = UNTRUSTED
-                       if output.find("could not be verified") != -1:
+                       if portage.output.find("could not be verified") != -1:
                                raise portage.exception.MissingSignature, filename
-                       if output.find("public key not found") != -1:
+                       if portage.output.find("public key not found") != -1:
                                if self.keyringIsTrusted: # We trust the ring, but not the key specifically.
                                        trustLevel = MARGINAL
                                else:

diff --git a/pym/portage/localization.py b/pym/portage/localization.py
index 2e9f620c809503f3a29b15c774fc380d25fe0199..f02439ffddb60cdc6f816c17a67a187c62c2ee12 100644 (file)
--- a/pym/portage/localization.py
+++ b/pym/portage/localization.py
@@ -1,4 +1,4 @@
-# portage.localization.py -- Code to manage/help portage localization.
+# localization.py -- Code to manage/help portage localization.
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index 90bfea9363cda76d02a93c3d0769542662376bf0..ecb73f22c207684b5b158652299c00ba0721b1e7 100644 (file)
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -1,4 +1,4 @@
-# portage.versions.py -- core Portage functionality
+# versions.py -- core Portage functionality
 # Copyright 1998-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$