| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-05 06:00:20 +0000 (Mon, 05 May 2008) |
| 3 |
New Revision: 10196 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
* Fix --buildpkgonly logic to avoid an unwanted code path. |
| 9 |
* Remove unnecessary mtimedb.pop("resume", None) call. |
| 10 |
(trunk r10194) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-05-05 05:56:52 UTC (rev 10195) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-05-05 06:00:20 UTC (rev 10196) |
| 17 |
@@ -8167,8 +8167,7 @@ |
| 18 |
retval = mergetask.merge(pkglist, favorites, mtimedb) |
| 19 |
merge_count = mergetask.curval |
| 20 |
|
| 21 |
- if retval == os.EX_OK and not (pretend or fetchonly): |
| 22 |
- mtimedb.pop("resume", None) |
| 23 |
+ if retval == os.EX_OK and not (buildpkgonly or fetchonly or pretend): |
| 24 |
if "yes" == settings.get("AUTOCLEAN"): |
| 25 |
portage.writemsg_stdout(">>> Auto-cleaning packages...\n") |
| 26 |
vartree = trees[settings["ROOT"]]["vartree"] |
| 27 |
|
| 28 |
-- |
| 29 |
gentoo-commits@l.g.o mailing list |
Archives