Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15255 - main/branches/2.1.7/pym/portage/dbapi
Date: Fri, 29 Jan 2010 18:49:26
Message-Id: E1NavuF-00077w-Ip@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-29 18:49:23 +0000 (Fri, 29 Jan 2010)
3 New Revision: 15255
4
5 Modified:
6 main/branches/2.1.7/pym/portage/dbapi/vartree.py
7 Log:
8 Don't bail out if postinst fails. Thanks to Brain Harring for the suggestion.
9 (trunk r15202)
10
11 Modified: main/branches/2.1.7/pym/portage/dbapi/vartree.py
12 ===================================================================
13 --- main/branches/2.1.7/pym/portage/dbapi/vartree.py 2010-01-29 18:49:10 UTC (rev 15254)
14 +++ main/branches/2.1.7/pym/portage/dbapi/vartree.py 2010-01-29 18:49:23 UTC (rev 15255)
15 @@ -2847,11 +2847,11 @@
16 finally:
17 self.settings.pop("PORTAGE_UPDATE_ENV", None)
18
19 - # XXX: Decide how to handle failures here.
20 if a != os.EX_OK:
21 + # It's stupid to bail out here, so keep going regardless of
22 + # phase return code.
23 showMessage(_("!!! FAILED postinst: ")+str(a)+"\n",
24 level=logging.ERROR, noiselevel=-1)
25 - return a
26
27 downgrade = False
28 for v in otherversions: