From f621e9c5e7f685956da4e4cf8f69f880ed5df0ee Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 26 Apr 2006 22:10:16 +0000 Subject: Make fetchlist_dict an optional parameter in the Manifest constructor since it's required only for generation of a Manifest (not needed for parsing and checking sums). svn path=/main/trunk/; revision=3245 --- bin/emerge | 9 +++++---- bin/repoman | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index d172af69c..fc3677ee5 100755 --- a/bin/emerge +++ b/bin/emerge @@ -789,10 +789,11 @@ class search: myebuild = portage.portdb.findname(mycpv) pkgdir = os.path.dirname(myebuild) import portage_manifest - mf = portage_manifest.Manifest(pkgdir, - portage.FetchlistDict(pkgdir, portage.settings, portage.portdb), - portage.settings["DISTDIR"]) - mysum[0] = mf.getDistfilesSize(mf.fetchlist_dict[mycpv]) + mf = portage_manifest.Manifest( + pkgdir, portage.settings["DISTDIR"]) + fetchlist = portage.portdb.getfetchlist(mycpv, + mysettings=portage.settings, all=True) + mysum[0] = mf.getDistfilesSize(fetchlist) mystr = str(mysum[0]/1024) mycount=len(mystr) while (mycount > 3): diff --git a/bin/repoman b/bin/repoman index 9cbe8b68a..03bc5ee1f 100755 --- a/bin/repoman +++ b/bin/repoman @@ -799,9 +799,7 @@ for x in scanlist: repoman_settings["O"] = checkdir portage.digestgen([], repoman_settings, manifestonly=1, myportdb=portage.portdb) - mf = Manifest(checkdir, - portage.FetchlistDict(checkdir, repoman_settings, portage.portdb), - repoman_settings["DISTDIR"]) + mf = Manifest(checkdir, repoman_settings["DISTDIR"]) mydigests=mf.getTypeDigests("DIST") myfiles_all = [] -- cgit v1.2.3-1-g7c22