* [gentoo-commits] portage r11926 - in main/trunk: bin pym/portage
@ 2008-11-15 5:09 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-11-15 5:09 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-11-15 05:09:07 +0000 (Sat, 15 Nov 2008)
New Revision: 11926
Modified:
main/trunk/bin/ebuild
main/trunk/pym/portage/__init__.py
Log:
Bug #236714 - Handle PortagePackageException raised from Manifest.create().
Modified: main/trunk/bin/ebuild
===================================================================
--- main/trunk/bin/ebuild 2008-11-15 05:00:34 UTC (rev 11925)
+++ main/trunk/bin/ebuild 2008-11-15 05:09:07 UTC (rev 11926)
@@ -202,7 +202,8 @@
for x in msg:
portage.writemsg(">>> %s\n" % x)
-from portage.exception import PermissionDenied, UnsupportedAPIException
+from portage.exception import PermissionDenied, \
+ PortagePackageException, UnsupportedAPIException
checked_for_stale_env = False
for arg in pargs:
@@ -230,6 +231,9 @@
for x in msg:
portage.writemsg("!!! %s\n" % x, noiselevel=-1)
a = 1
+ except PortagePackageException, e:
+ portage.writemsg("!!! %s\n" % (e,), noiselevel=-1)
+ a = 1
except PermissionDenied, e:
portage.writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1)
a = 1
Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py 2008-11-15 05:00:34 UTC (rev 11925)
+++ main/trunk/pym/portage/__init__.py 2008-11-15 05:09:07 UTC (rev 11926)
@@ -4260,6 +4260,9 @@
writemsg(("!!! File %s doesn't exist, can't update " + \
"Manifest\n") % e, noiselevel=-1)
return 0
+ except portage.exception.PortagePackageException, e:
+ writemsg(("!!! %s\n") % (e,), noiselevel=-1)
+ return 0
try:
mf.write(sign=False)
except portage.exception.PermissionDenied, e:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-15 5:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-15 5:09 [gentoo-commits] portage r11926 - in main/trunk: bin pym/portage Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox