summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-02 06:22:19 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-02 06:22:19 +0000
commitdd2f528c43bf8a48bf2dd4b779b0b78ab3789a67 (patch)
tree901395da13209ddf3bc7c53791ec81023d0f3afc
parent45d48d8e7cfa57299d5de3ca241efacc6132b1d3 (diff)
downloadportage-dd2f528c43bf8a48bf2dd4b779b0b78ab3789a67.tar.gz
portage-dd2f528c43bf8a48bf2dd4b779b0b78ab3789a67.tar.bz2
portage-dd2f528c43bf8a48bf2dd4b779b0b78ab3789a67.zip
Migrate old digest-* code in portage.fetch() to be Manifest2 compatible.
svn path=/main/trunk/; revision=3304
-rw-r--r--pym/portage.py6
1 files changed, 2 insertions, 4 deletions
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):