diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:09:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:09:26 +0000 |
| commit | b43f13bbff027372cd0ad56da16174484c7439a4 (patch) | |
| tree | 790d1c7e069b465f4f528c57d35309a2809bc958 | |
| parent | 0e6324c8ddf8a1a8d1160092d57bb64a1f2935a8 (diff) | |
| download | portage-b43f13bbff027372cd0ad56da16174484c7439a4.tar.gz portage-b43f13bbff027372cd0ad56da16174484c7439a4.tar.bz2 portage-b43f13bbff027372cd0ad56da16174484c7439a4.zip | |
Remove print() usage. (trunk r15494)
svn path=/main/branches/2.1.7/; revision=15695
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 39dd6eb8c..124783ca2 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -2,8 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -from __future__ import print_function - __all__ = [ "close_portdbapi_caches", "FetchlistDict", "portagetree", "portdbapi" ] @@ -809,8 +807,8 @@ class portdbapi(dbapi): checksums = mf.getDigests() if not checksums: if debug: - print("[empty/missing/bad digest]: "+mypkg) - return None + writemsg("[empty/missing/bad digest]: %s\n" % (mypkg,)) + return {} filesdict={} myfiles = self.getFetchMap(mypkg, useflags=useflags) #XXX: maybe this should be improved: take partial downloads @@ -1091,8 +1089,8 @@ class portdbapi(dbapi): else: myval = list(self._iter_match(mydep, self.cp_list(mykey))) else: - print("ERROR: xmatch doesn't handle", level, "query!") - raise KeyError + raise AssertionError( + "Invalid level argument: '%s'" % level) if self.frozen and (level not in ["match-list", "bestmatch-list"]): self.xcache[level][mydep] = myval |