From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 May 2006 06:22:19 +0000 (-0000)
Subject: Migrate old digest-* code in portage.fetch() to be Manifest2 compatible.
X-Git-Tag: v2.1_rc1~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd2f528c43bf8a48bf2dd4b779b0b78ab3789a67;p=portage.git

Migrate old digest-* code in portage.fetch() to be Manifest2 compatible.

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

diff --git a/pym/portage.py b/pym/portage.py
index 765f0d925..a30391181 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1881,10 +1881,8 @@ 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 = {}
-	digestfn  = mysettings["FILESDIR"]+"/digest-"+mysettings["PF"]
-	if os.path.exists(digestfn):
-		mydigests = digestParseFile(digestfn)
+	mydigests = Manifest(
+		mysettings["O"], mysettings["DISTDIR"]).getTypeDigests("DIST")
 
 	fsmirrors = []
 	for x in range(len(mymirrors)-1,-1,-1):