From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 20 May 2007 21:28:53 +0000 (-0000)
Subject: In fetch(), don't try to parse digests unless the "O" variable is defined.
X-Git-Tag: v2.2_pre1~1404
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=110746d070934150c2d0346aeb8d53334328540a;p=portage.git

In fetch(), don't try to parse digests unless the "O" variable is defined.

svn path=/main/trunk/; revision=6561
---

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):