Make digestgen() handle PermissionDenied internally by returning failure, so

callers like repoman don't need exception handling. (trunk r11924)

svn path=/main/branches/2.1.6/; revision=11925

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 888d1ee2e0f6fabfedefcbe5ad6235e8c413ed22..37b91aa255343b3190a908349607872f153b49eb 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4250,7 +4250,11 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
                        writemsg(("!!! File %s doesn't exist, can't update " + \
                                "Manifest\n") % e, noiselevel=-1)
                        return 0
-               mf.write(sign=False)
+               try:
+                       mf.write(sign=False)
+               except portage.exception.PermissionDenied, e:
+                       writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1)
+                       return 0
                if "assume-digests" not in mysettings.features:
                        distlist = mf.fhashdict.get("DIST", {}).keys()
                        distlist.sort()