| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-09 19:13:08 +0000 (Fri, 09 May 2008) |
| 3 |
New Revision: 10276 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Bug #221053 - Save the resume list before verifying the ebuild Manifests |
| 9 |
since it might be possible for the user to use --resume --skipfirst get |
| 10 |
past a non-essential package with a broken digest. (trunk r10275) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-05-09 19:12:48 UTC (rev 10275) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-05-09 19:13:08 UTC (rev 10276) |
| 17 |
@@ -5767,6 +5767,13 @@ |
| 18 |
print colorize("GOOD", "*** Resuming merge...") |
| 19 |
emergelog(xterm_titles, " *** Resuming merge...") |
| 20 |
|
| 21 |
+ # Do this before verifying the ebuild Manifests since it might |
| 22 |
+ # be possible for the user to use --resume --skipfirst get past |
| 23 |
+ # a non-essential package with a broken digest. |
| 24 |
+ mtimedb["resume"]["mergelist"] = [list(x) for x in mylist \ |
| 25 |
+ if isinstance(x, Package) and x.operation == "merge"] |
| 26 |
+ mtimedb.commit() |
| 27 |
+ |
| 28 |
# Verify all the manifests now so that the user is notified of failure |
| 29 |
# as soon as possible. |
| 30 |
if "--fetchonly" not in self.myopts and \ |
| 31 |
@@ -5800,10 +5807,6 @@ |
| 32 |
args_set = InternalPackageSet(favorites) |
| 33 |
world_set = root_config.sets["world"] |
| 34 |
|
| 35 |
- mtimedb["resume"]["mergelist"] = [list(x) for x in mylist \ |
| 36 |
- if isinstance(x, Package) and x.operation == "merge"] |
| 37 |
- mtimedb.commit() |
| 38 |
- |
| 39 |
mymergelist = mylist |
| 40 |
myfeat = self.settings.features[:] |
| 41 |
bad_resume_opts = set(["--ask", "--changelog", "--skipfirst", |
| 42 |
|
| 43 |
-- |
| 44 |
gentoo-commits@l.g.o mailing list |
Archives