From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-103168-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1L1DPC-0004wZ-BL
	for garchives@archives.gentoo.org; Sat, 15 Nov 2008 05:09:10 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A2B41E0316;
	Sat, 15 Nov 2008 05:09:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 7750DE0316
	for <gentoo-commits@lists.gentoo.org>; Sat, 15 Nov 2008 05:09:10 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 6F75B64285
	for <gentoo-commits@lists.gentoo.org>; Sat, 15 Nov 2008 05:09:08 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1L1DPA-0007Qf-7H
	for gentoo-commits@lists.gentoo.org; Sat, 15 Nov 2008 05:09:08 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r11926 - in main/trunk: bin pym/portage
X-VCS-Repository: portage
X-VCS-Revision: 11926
X-VCS-Files: main/trunk/bin/ebuild main/trunk/pym/portage/__init__.py
X-VCS-Directories: bin pym/portage
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1L1DPA-0007Qf-7H@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Sat, 15 Nov 2008 05:09:08 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 891f1910-1648-4667-9b04-d230917a1bf4
X-Archives-Hash: 77fc0f6ef277ba47212622a4399f4b85

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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)
=20
-from portage.exception import PermissionDenied, UnsupportedAPIException
+from portage.exception import PermissionDenied, \
+	PortagePackageException, UnsupportedAPIException
 checked_for_stale_env =3D False
=20
 for arg in pargs:
@@ -230,6 +231,9 @@
 		for x in msg:
 			portage.writemsg("!!! %s\n" % x, noiselevel=3D-1)
 		a =3D 1
+	except PortagePackageException, e:
+		portage.writemsg("!!! %s\n" % (e,), noiselevel=3D-1)
+		a =3D 1
 	except PermissionDenied, e:
 		portage.writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=3D-1=
)
 		a =3D 1

Modified: main/trunk/pym/portage/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D-1)
 			return 0
+		except portage.exception.PortagePackageException, e:
+			writemsg(("!!! %s\n") % (e,), noiselevel=3D-1)
+			return 0
 		try:
 			mf.write(sign=3DFalse)
 		except portage.exception.PermissionDenied, e: