| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-03 03:47:21 +0000 (Sat, 03 May 2008) |
| 3 |
New Revision: 10124 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Also move mtimedb resume list validation earlier. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-03 03:43:19 UTC (rev 10123) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-03 03:47:21 UTC (rev 10124) |
| 15 |
@@ -7576,6 +7576,16 @@ |
| 16 |
def action_build(settings, trees, mtimedb, |
| 17 |
myopts, myaction, myfiles, spinner): |
| 18 |
|
| 19 |
+ # validate the state of the resume data |
| 20 |
+ # so that we can make assumptions later. |
| 21 |
+ for k in ("resume", "resume_backup"): |
| 22 |
+ if k in mtimedb: |
| 23 |
+ if "mergelist" in mtimedb[k]: |
| 24 |
+ if not mtimedb[k]["mergelist"]: |
| 25 |
+ del mtimedb[k] |
| 26 |
+ else: |
| 27 |
+ del mtimedb[k] |
| 28 |
+ |
| 29 |
resume = False |
| 30 |
if "--resume" in myopts and \ |
| 31 |
("resume" in mtimedb or |
| 32 |
@@ -7650,16 +7660,6 @@ |
| 33 |
print darkgreen("These are the packages that would be %s, in order:") % action |
| 34 |
print |
| 35 |
|
| 36 |
- # validate the state of the resume data |
| 37 |
- # so that we can make assumptions later. |
| 38 |
- for k in ("resume", "resume_backup"): |
| 39 |
- if k in mtimedb: |
| 40 |
- if "mergelist" in mtimedb[k]: |
| 41 |
- if not mtimedb[k]["mergelist"]: |
| 42 |
- del mtimedb[k] |
| 43 |
- else: |
| 44 |
- del mtimedb[k] |
| 45 |
- |
| 46 |
show_spinner = "--quiet" not in myopts and "--nodeps" not in myopts |
| 47 |
if not show_spinner: |
| 48 |
spinner.update = spinner.update_quiet |
| 49 |
|
| 50 |
-- |
| 51 |
gentoo-commits@l.g.o mailing list |
Archives