From 064104225b74e6db799c65a30dba1bd4b6b68132 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Thu, 25 Jan 2007 17:07:32 +0000 Subject: [PATCH] Namespace sanitizing, step 3 svn path=/main/trunk/; revision=5782 --- pym/portage/__init__.py | 54 +++++++++++++------------- pym/portage/cache/anydbm.py | 4 +- pym/portage/cache/flat_hash.py | 6 +-- pym/portage/cache/flat_list.py | 4 +- pym/portage/cache/fs_template.py | 2 +- pym/portage/cache/metadata.py | 10 ++--- pym/portage/cache/metadata_overlay.py | 8 ++-- pym/portage/cache/sql_template.py | 4 +- pym/portage/cache/sqlite.py | 6 +-- pym/portage/cache/template.py | 6 +-- pym/portage/cache/util.py | 8 ++-- pym/portage/cache/volatile.py | 2 +- pym/portage/checksum.py | 2 +- pym/portage/data.py | 6 +-- pym/portage/elog_modules/mod_custom.py | 6 +-- pym/portage/emergehelp.py | 2 +- pym/portage/getbinpkg.py | 12 +++--- pym/portage/gpg.py | 12 +++--- pym/portage/localization.py | 2 +- pym/portage/versions.py | 2 +- 20 files changed, 79 insertions(+), 79 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 044468fe6..ffecf0343 100644 --- 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 a4e0003d4..8d72e40ca 100644 --- 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 48e8a175e..24998a6d3 100644 --- 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 85efa4c02..6dbbba96b 100644 --- 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 1fdfac764..066a96117 100644 --- 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 df039d5e2..427fc1936 100644 --- 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 d82ba96f8..d1fcda1d1 100644 --- 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 e635616e9..4ef3df421 100644 --- 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 ee3dde3c7..1cab49978 100644 --- 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 4ffd9b9ef..6fe9f3b00 100644 --- 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 6393deef5..025887715 100644 --- 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 0a204b70f..555eafc5a 100644 --- 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 51f8e37bc..1a96787ec 100644 --- 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 1ed53419c..10a480cd1 100644 --- 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 f95e1999a..5fae84078 100644 --- 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 373e0bf44..60ae52c2d 100644 --- 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 462da429d..b0d5ca9eb 100644 --- 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 7dd758506..93335e11b 100644 --- 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 2e9f620c8..f02439ffd 100644 --- 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 90bfea936..ecb73f22c 100644 --- 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$ -- 2.26.2