| 1 |
Author: grobian |
| 2 |
Date: 2008-11-22 11:36:32 +0000 (Sat, 22 Nov 2008) |
| 3 |
New Revision: 12039 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/man/emerge.1 |
| 7 |
main/branches/prefix/pym/_emerge/__init__.py |
| 8 |
main/branches/prefix/pym/portage/__init__.py |
| 9 |
main/branches/prefix/pym/portage/cache/metadata.py |
| 10 |
Log: |
| 11 |
Merged from trunk -r12020:12033 |
| 12 |
|
| 13 |
| 12022 | Bug #247776 - Show a warning message if CONFIG_PROTECT is | |
| 14 |
| zmedico | empty. | |
| 15 |
|
| 16 |
| 12024 | Fix some cases in dep_zapdeps() where blocker atoms are | |
| 17 |
| zmedico | inappropriately tested for availablity. Thanks to Jorge | |
| 18 |
| | Manuel B. S. Vicetto <jmbsvicetto@g.o> for reporting. | |
| 19 |
|
| 20 |
| 12026 | Add missing '%' symbol (for binary package moves) to the key | |
| 21 |
| zmedico | that's displayed by _global_updates(). Thanks to Andrew | |
| 22 |
| | Gaffney <agaffney@g.o> for reporting. | |
| 23 |
|
| 24 |
| 12028 | Make sure the dict returned from _parse_data() contains all | |
| 25 |
| zmedico | of _known_keys. | |
| 26 |
|
| 27 |
| 12030 | Fix quoting on $CHANGELOG_REVISION. | |
| 28 |
| zmedico | | |
| 29 |
|
| 30 |
| 12033 | Add some people to the AUTHORS section. | |
| 31 |
| zmedico | | |
| 32 |
|
| 33 |
|
| 34 |
Modified: main/branches/prefix/man/emerge.1 |
| 35 |
=================================================================== |
| 36 |
--- main/branches/prefix/man/emerge.1 2008-11-22 11:34:13 UTC (rev 12038) |
| 37 |
+++ main/branches/prefix/man/emerge.1 2008-11-22 11:36:32 UTC (rev 12039) |
| 38 |
@@ -672,6 +672,9 @@ |
| 39 |
Phil Bordelon <phil@×××××××××××××××.org> |
| 40 |
Mike Frysinger <vapier@g.o> |
| 41 |
Marius Mauch <genone@g.o> |
| 42 |
+Jason Stubbs <jstubbs@g.o> |
| 43 |
+Brian Harring <ferringb@×××××.com> |
| 44 |
+Zac Medico <zmedico@g.o> |
| 45 |
.fi |
| 46 |
.SH "FILES" |
| 47 |
Here is a common list of files you will probably be interested in. For a |
| 48 |
|
| 49 |
Modified: main/branches/prefix/pym/_emerge/__init__.py |
| 50 |
=================================================================== |
| 51 |
--- main/branches/prefix/pym/_emerge/__init__.py 2008-11-22 11:34:13 UTC (rev 12038) |
| 52 |
+++ main/branches/prefix/pym/_emerge/__init__.py 2008-11-22 11:36:32 UTC (rev 12039) |
| 53 |
@@ -13978,6 +13978,14 @@ |
| 54 |
|
| 55 |
return bool(missing_repo_names) |
| 56 |
|
| 57 |
+def config_protect_check(trees): |
| 58 |
+ for root, root_trees in trees.iteritems(): |
| 59 |
+ if not root_trees["root_config"].settings.get("CONFIG_PROTECT"): |
| 60 |
+ msg = "!!! CONFIG_PROTECT is empty" |
| 61 |
+ if root != "/": |
| 62 |
+ msg += " for '%s'" % root |
| 63 |
+ writemsg_level(msg, level=logging.WARN, noiselevel=-1) |
| 64 |
+ |
| 65 |
def ambiguous_package_name(arg, atoms, root_config, spinner, myopts): |
| 66 |
|
| 67 |
if "--quiet" in myopts: |
| 68 |
@@ -14061,6 +14069,7 @@ |
| 69 |
if "--quiet" not in myopts: |
| 70 |
portage.deprecated_profile_check() |
| 71 |
repo_name_check(trees) |
| 72 |
+ config_protect_check(trees) |
| 73 |
|
| 74 |
eclasses_overridden = {} |
| 75 |
for mytrees in trees.itervalues(): |
| 76 |
|
| 77 |
Modified: main/branches/prefix/pym/portage/__init__.py |
| 78 |
=================================================================== |
| 79 |
--- main/branches/prefix/pym/portage/__init__.py 2008-11-22 11:34:13 UTC (rev 12038) |
| 80 |
+++ main/branches/prefix/pym/portage/__init__.py 2008-11-22 11:36:32 UTC (rev 12039) |
| 81 |
@@ -6433,6 +6433,8 @@ |
| 82 |
all_available = True |
| 83 |
versions = {} |
| 84 |
for atom in atoms: |
| 85 |
+ if atom[:1] == "!": |
| 86 |
+ continue |
| 87 |
avail_pkg = mydbapi.match(atom) |
| 88 |
if avail_pkg: |
| 89 |
avail_pkg = avail_pkg[-1] # highest (ascending order) |
| 90 |
@@ -6450,7 +6452,8 @@ |
| 91 |
# If any version of a package is installed then we assume that it |
| 92 |
# is preferred over other possible packages choices. |
| 93 |
all_installed = True |
| 94 |
- for atom in set([dep_getkey(atom) for atom in atoms]): |
| 95 |
+ for atom in set([dep_getkey(atom) for atom in atoms \ |
| 96 |
+ if atom[:1] != "!"]): |
| 97 |
# New-style virtuals have zero cost to install. |
| 98 |
if not vardb.match(atom) and not atom.startswith("virtual/"): |
| 99 |
all_installed = False |
| 100 |
@@ -7323,7 +7326,7 @@ |
| 101 |
writemsg_stdout("\n\n") |
| 102 |
writemsg_stdout(green("Performing Global Updates: ")+bold(mykey)+"\n") |
| 103 |
writemsg_stdout("(Could take a couple of minutes if you have a lot of binary packages.)\n") |
| 104 |
- writemsg_stdout(" "+bold(".")+"='update pass' "+bold("*")+"='binary update' "+bold("@")+"='/var/db move'\n"+" "+bold("s")+"='/var/db SLOT move' "+bold("S")+"='binary SLOT move' "+bold("p")+"='update /etc/portage/package.*'\n") |
| 105 |
+ 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' "+bold("p")+"='update /etc/portage/package.*'\n") |
| 106 |
valid_updates, errors = parse_updates(mycontent) |
| 107 |
myupd.extend(valid_updates) |
| 108 |
writemsg_stdout(len(valid_updates) * "." + "\n") |
| 109 |
|
| 110 |
Modified: main/branches/prefix/pym/portage/cache/metadata.py |
| 111 |
=================================================================== |
| 112 |
--- main/branches/prefix/pym/portage/cache/metadata.py 2008-11-22 11:34:13 UTC (rev 12038) |
| 113 |
+++ main/branches/prefix/pym/portage/cache/metadata.py 2008-11-22 11:36:32 UTC (rev 12039) |
| 114 |
@@ -64,6 +64,9 @@ |
| 115 |
# because it calls reconstruct_eclasses() internally. |
| 116 |
d["_eclasses_"] = reconstruct_eclasses(None, d["_eclasses_"]) |
| 117 |
|
| 118 |
+ for x in self._known_keys: |
| 119 |
+ d.setdefault(x, '') |
| 120 |
+ |
| 121 |
return d |
Archives