diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-10 04:17:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-10 04:17:52 +0000 |
| commit | fb79e1f29945f02f22024a5a14de21338e5aa60e (patch) | |
| tree | f25f2d4ff85ec949b0cffa7a5ca395b487e677a7 /pym | |
| parent | a2e2efd80bcbb11f7265140fb79e32ff4af97dc8 (diff) | |
| download | portage-fb79e1f29945f02f22024a5a14de21338e5aa60e.tar.gz portage-fb79e1f29945f02f22024a5a14de21338e5aa60e.tar.bz2 portage-fb79e1f29945f02f22024a5a14de21338e5aa60e.zip | |
Bug #225285 - Allow digestcheck() to succeed when the Manifest is empty and
strict mode is disabled. (trunk r10636)
svn path=/main/branches/2.1.2/; revision=10637
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index 3d65c1341..932d6957e 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4062,6 +4062,18 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0): else: return 1 mf = Manifest(pkgdir, mysettings["DISTDIR"]) + manifest_empty = True + for d in mf.fhashdict.itervalues(): + if d: + manifest_empty = False + break + if manifest_empty: + writemsg("!!! Manifest is empty: '%s'\n" % manifest_path, + noiselevel=-1) + if strict: + return 0 + else: + return 1 eout = output.EOutput() eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" try: |