summaryrefslogtreecommitdiffstats
path: root/pym/portage/__init__.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-15 05:00:34 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-15 05:00:34 +0000
commit7bcdb48a4fbaada038ee4b2d6d200f610575bf53 (patch)
tree9ea0ed256e024e718e0e464204aa2a046ea4311f /pym/portage/__init__.py
parent4991fada6b05d47b7880b1de30e81ab655cae273 (diff)
downloadportage-7bcdb48a4fbaada038ee4b2d6d200f610575bf53.tar.gz
portage-7bcdb48a4fbaada038ee4b2d6d200f610575bf53.tar.bz2
portage-7bcdb48a4fbaada038ee4b2d6d200f610575bf53.zip
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
Diffstat (limited to 'pym/portage/__init__.py')
-rw-r--r--pym/portage/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 888d1ee2e..37b91aa25 100644
--- 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()