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 765f0d925b21f2914ad9952c8a16f390b8bd527d..a30391181fe28b6a4927e5af65c3ff137522b693 100644 (file)
--- 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):