| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-28 21:16:37 +0000 (Mon, 28 Apr 2008) |
| 3 |
New Revision: 10031 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
When a package scheduled for uninstall isn't installed anymore, move |
| 9 |
on to the next task. (trunk r10030) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-04-28 21:15:27 UTC (rev 10030) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-04-28 21:16:37 UTC (rev 10031) |
| 16 |
@@ -5325,6 +5325,8 @@ |
| 17 |
myroot=x[1] |
| 18 |
pkg_key = x[2] |
| 19 |
pkgindex=2 |
| 20 |
+ built = pkg_type != "ebuild" |
| 21 |
+ installed = pkg_type == "installed" |
| 22 |
portdb = self.trees[myroot]["porttree"].dbapi |
| 23 |
bindb = self.trees[myroot]["bintree"].dbapi |
| 24 |
vartree = self.trees[myroot]["vartree"] |
| 25 |
@@ -5347,10 +5349,16 @@ |
| 26 |
mydbapi = vardb |
| 27 |
else: |
| 28 |
raise AssertionError("Package type: '%s'" % pkg_type) |
| 29 |
- metadata.update(izip(metadata_keys, |
| 30 |
- mydbapi.aux_get(pkg_key, metadata_keys))) |
| 31 |
- built = pkg_type != "ebuild" |
| 32 |
- installed = pkg_type == "installed" |
| 33 |
+ try: |
| 34 |
+ metadata.update(izip(metadata_keys, |
| 35 |
+ mydbapi.aux_get(pkg_key, metadata_keys))) |
| 36 |
+ except KeyError: |
| 37 |
+ if not installed: |
| 38 |
+ raise |
| 39 |
+ # A package scheduled for uninstall apparently |
| 40 |
+ # isn't installed anymore. Since it's already |
| 41 |
+ # been uninstalled, move on to the next task. |
| 42 |
+ continue |
| 43 |
if installed: |
| 44 |
pkg_constructor = Uninstall |
| 45 |
else: |
| 46 |
|
| 47 |
-- |
| 48 |
gentoo-commits@l.g.o mailing list |
Archives