diff options
| author | Brian Harring <ferringb@gmail.com> | 2011-08-31 17:29:58 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-12 14:23:10 -0700 |
| commit | f908cddb505b81533861196c4713378e63dac1fa (patch) | |
| tree | 5b457d169759dee1981a9cd44b52d875a8ea80eb /bin | |
| parent | 53860ffa675b0cf1930589ff9fa15b5ffaa2cf75 (diff) | |
| download | portage-f908cddb505b81533861196c4713378e63dac1fa.tar.gz portage-f908cddb505b81533861196c4713378e63dac1fa.tar.bz2 portage-f908cddb505b81533861196c4713378e63dac1fa.zip | |
Bind all manifest access through repoconfigs
This enables controling the behaviour (creation and validation) per
repo, and while mildly ugly, refactors in the right direction.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild | 5 | ||||
| -rwxr-xr-x | bin/repoman | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bin/ebuild b/bin/ebuild index db7e5e385..92105bbbd 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -200,8 +200,9 @@ def discard_digests(myebuild, mysettings, mydbapi): portage._doebuild_manifest_exempt_depend += 1 pkgdir = os.path.dirname(myebuild) fetchlist_dict = portage.FetchlistDict(pkgdir, mysettings, mydbapi) - from portage.manifest import Manifest - mf = Manifest(pkgdir, mysettings["DISTDIR"], + mf = mysettings.repositories.get_repo_for_location( + os.path.dirname(os.path.dirname(pkgdir))) + mf = mf.load_manifest(pkgdir, mysettings["DISTDIR"], fetchlist_dict=fetchlist_dict, manifest1_compat=False) mf.create(requiredDistfiles=None, assumeDistHashesSometimes=True, assumeDistHashesAlways=True) diff --git a/bin/repoman b/bin/repoman index b40d2d18c..3462f939d 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1104,7 +1104,9 @@ for x in scanlist: portage._doebuild_manifest_exempt_depend += 1 try: distdir = repoman_settings['DISTDIR'] - mf = portage.manifest.Manifest(checkdir, distdir, + mf = repoman_settings.repositories.get_repo_for_location( + os.path.dirname(os.path.dirname(checkdir))) + mf = mf.load_manifest(checkdir, distdir, fetchlist_dict=fetchlist_dict) mf.create(requiredDistfiles=None, assumeDistHashesAlways=True) @@ -1314,7 +1316,9 @@ for x in scanlist: raise continue - mf = Manifest(checkdir, repoman_settings["DISTDIR"]) + mf = repoman_settings.repositories.get_repo_for_location( + os.path.dirname(os.path.dirname(checkdir))) + mf = mf.load_manifest(checkdir, repoman_settings["DISTDIR"]) mydigests=mf.getTypeDigests("DIST") fetchlist_dict = portage.FetchlistDict(checkdir, repoman_settings, portdb) |