summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-05-20 21:28:53 +0000
committerZac Medico <zmedico@gentoo.org>2007-05-20 21:28:53 +0000
commit110746d070934150c2d0346aeb8d53334328540a (patch)
tree9f7d9e89498329f0d5add53b3a22eb0892b33909
parent544d9a24d05465a00b05d52c428041abb4e0739c (diff)
downloadportage-110746d070934150c2d0346aeb8d53334328540a.tar.gz
portage-110746d070934150c2d0346aeb8d53334328540a.tar.bz2
portage-110746d070934150c2d0346aeb8d53334328540a.zip
In fetch(), don't try to parse digests unless the "O" variable is defined.
svn path=/main/trunk/; revision=6561
-rw-r--r--pym/portage/__init__.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index f58438158..664f0a7d7 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2405,8 +2405,13 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
if try_mirrors:
mymirrors += [x.rstrip("/") for x in mysettings["GENTOO_MIRRORS"].split() if x]
- mydigests = Manifest(
- mysettings["O"], mysettings["DISTDIR"]).getTypeDigests("DIST")
+ pkgdir = mysettings.get("O")
+ if pkgdir:
+ mydigests = Manifest(
+ pkgdir, mysettings["DISTDIR"]).getTypeDigests("DIST")
+ else:
+ # no digests because fetch was not called for a specific package
+ mydigests = {}
fsmirrors = []
for x in range(len(mymirrors)-1,-1,-1):