| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-05 00:09:54 +0000 (Fri, 05 Dec 2008) |
| 3 |
New Revision: 12160 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Make fixpackages use a new "#" symbol for /var/db updates (previously '*' |
| 9 |
which means 'binary update' was used). (trunk r12159) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/pym/portage/__init__.py 2008-12-05 00:08:58 UTC (rev 12159) |
| 15 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2008-12-05 00:09:54 UTC (rev 12160) |
| 16 |
@@ -7295,7 +7295,13 @@ |
| 17 |
writemsg_stdout("\n\n") |
| 18 |
writemsg_stdout(green("Performing Global Updates: ")+bold(mykey)+"\n") |
| 19 |
writemsg_stdout("(Could take a couple of minutes if you have a lot of binary packages.)\n") |
| 20 |
- writemsg_stdout(" "+bold(".")+"='update pass' "+bold("*")+"='binary update' "+bold("@")+"='/var/db move'\n"+" "+bold("s")+"='/var/db SLOT move' "+bold("%")+"='binary move' "+bold("S")+"='binary SLOT move'\n "+bold("p")+"='update /etc/portage/package.*'\n") |
| 21 |
+ writemsg_stdout(" " + bold(".") + "='update pass' " + \ |
| 22 |
+ bold("*") + "='binary update' " + bold("#") + \ |
| 23 |
+ "='/var/db update' " + bold("@") + "='/var/db move'\n" + \ |
| 24 |
+ " " + bold("s") + "='/var/db SLOT move' " + \ |
| 25 |
+ bold("%") + "='binary move' " + bold("S") + \ |
| 26 |
+ "='binary SLOT move'\n " + \ |
| 27 |
+ bold("p") + "='update /etc/portage/package.*'\n") |
| 28 |
valid_updates, errors = parse_updates(mycontent) |
| 29 |
myupd.extend(valid_updates) |
| 30 |
writemsg_stdout(len(valid_updates) * "." + "\n") |
| 31 |
@@ -7365,9 +7371,12 @@ |
| 32 |
"fixpackages" in mysettings.features: |
| 33 |
def onUpdate(maxval, curval): |
| 34 |
if curval > 0: |
| 35 |
- writemsg_stdout("*") |
| 36 |
+ writemsg_stdout("#") |
| 37 |
vardb.update_ents(myupd, onUpdate=onUpdate) |
| 38 |
if bindb: |
| 39 |
+ def onUpdate(maxval, curval): |
| 40 |
+ if curval > 0: |
| 41 |
+ writemsg_stdout("*") |
| 42 |
bindb.update_ents(myupd, onUpdate=onUpdate) |
| 43 |
else: |
| 44 |
do_upgrade_packagesmessage = 1 |
Archives