| 1 |
Author: zmedico |
| 2 |
Date: 2008-02-27 16:16:30 +0000 (Wed, 27 Feb 2008) |
| 3 |
New Revision: 9391 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Revert r9387 (the fix for bug #211554) until I figure out why it's messing |
| 10 |
up USE calculations for world updates. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-02-27 16:02:34 UTC (rev 9390) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-02-27 16:16:30 UTC (rev 9391) |
| 17 |
@@ -1103,7 +1103,7 @@ |
| 18 |
metadata = None |
| 19 |
if metadata and not built: |
| 20 |
pkgsettings.setcpv(cpv, mydb=metadata) |
| 21 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 22 |
+ metadata["USE"] = pkgsettings.get("USE", "") |
| 23 |
if metadata is None: |
| 24 |
mreasons = ["corruption"] |
| 25 |
else: |
| 26 |
@@ -2119,7 +2119,7 @@ |
| 27 |
metadata = dict(izip(self._mydbapi_keys, |
| 28 |
portdb.aux_get(mykey, self._mydbapi_keys))) |
| 29 |
pkgsettings.setcpv(mykey, mydb=metadata) |
| 30 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 31 |
+ metadata["USE"] = pkgsettings["USE"] |
| 32 |
pkg = Package(type_name="ebuild", root=myroot, |
| 33 |
cpv=mykey, metadata=metadata, onlydeps=onlydeps) |
| 34 |
args.append(PackageArg(arg=x, package=pkg, |
| 35 |
@@ -2427,7 +2427,7 @@ |
| 36 |
if not built: |
| 37 |
if (is_virt or "?" in metadata["LICENSE"]): |
| 38 |
pkgsettings.setcpv(cpv, mydb=metadata) |
| 39 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 40 |
+ metadata["USE"] = pkgsettings["USE"] |
| 41 |
else: |
| 42 |
metadata["USE"] = "" |
| 43 |
|
| 44 |
@@ -2615,7 +2615,7 @@ |
| 45 |
if not built: |
| 46 |
if "?" in metadata["LICENSE"]: |
| 47 |
pkgsettings.setcpv(cpv, mydb=metadata) |
| 48 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 49 |
+ metadata["USE"] = pkgsettings.get("USE","") |
| 50 |
else: |
| 51 |
metadata["USE"] = "" |
| 52 |
myarg = None |
| 53 |
@@ -2672,7 +2672,7 @@ |
| 54 |
pkgsettings.setcpv(myeb, mydb=mydb) |
| 55 |
else: |
| 56 |
pkgsettings.setcpv(cpv, mydb=mydb) |
| 57 |
- now_use = pkgsettings["PORTAGE_USE"].split() |
| 58 |
+ now_use = pkgsettings["USE"].split() |
| 59 |
forced_flags = set() |
| 60 |
forced_flags.update(pkgsettings.useforce) |
| 61 |
forced_flags.update(pkgsettings.usemask) |
| 62 |
@@ -2698,7 +2698,7 @@ |
| 63 |
old_use = vardb.aux_get(cpv, ["USE"])[0].split() |
| 64 |
old_iuse = set(filter_iuse_defaults( |
| 65 |
vardb.aux_get(cpv, ["IUSE"])[0].split())) |
| 66 |
- cur_use = pkgsettings["PORTAGE_USE"].split() |
| 67 |
+ cur_use = pkgsettings["USE"].split() |
| 68 |
cur_iuse = set(filter_iuse_defaults( |
| 69 |
metadata["IUSE"].split())) |
| 70 |
reinstall_for_flags = \ |
| 71 |
@@ -2729,7 +2729,7 @@ |
| 72 |
db.aux_get(cpv, self._mydbapi_keys))) |
| 73 |
if not built: |
| 74 |
pkgsettings.setcpv(cpv, mydb=metadata) |
| 75 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 76 |
+ metadata["USE"] = pkgsettings.get("USE","") |
| 77 |
myeb = cpv |
| 78 |
matched_packages.append( |
| 79 |
Package(type_name=pkg_type, root=root, |
| 80 |
@@ -3652,7 +3652,7 @@ |
| 81 |
repo_path_real = os.path.dirname(os.path.dirname( |
| 82 |
os.path.dirname(ebuild_path))) |
| 83 |
pkgsettings.setcpv(pkg_key, mydb=mydbapi) |
| 84 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 85 |
+ metadata["USE"] = pkgsettings["USE"] |
| 86 |
else: |
| 87 |
repo_path_real = portdb.getRepositoryPath(repo_name) |
| 88 |
pkg_use = metadata["USE"].split() |
| 89 |
@@ -4242,7 +4242,7 @@ |
| 90 |
if pkg_type == "ebuild": |
| 91 |
pkgsettings = self.pkgsettings[myroot] |
| 92 |
pkgsettings.setcpv(pkg_key, mydb=fakedb[myroot]) |
| 93 |
- fakedb[myroot].aux_update(pkg_key, {"USE":pkgsettings["PORTAGE_USE"]}) |
| 94 |
+ fakedb[myroot].aux_update(pkg_key, {"USE":pkgsettings["USE"]}) |
| 95 |
self.spinner.update() |
| 96 |
|
| 97 |
class RepoDisplay(object): |
| 98 |
@@ -4532,7 +4532,7 @@ |
| 99 |
metadata.update(izip(metadata_keys, |
| 100 |
mydbapi.aux_get(pkg_key, metadata_keys))) |
| 101 |
pkgsettings.setcpv(pkg_key, mydb=mydbapi) |
| 102 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 103 |
+ metadata["USE"] = pkgsettings["USE"] |
| 104 |
else: |
| 105 |
if pkg_type == "binary": |
| 106 |
mydbapi = bindb |
| 107 |
@@ -6282,7 +6282,7 @@ |
| 108 |
if portdb.cpv_exists(pkg): |
| 109 |
mydb = portdb |
| 110 |
pkgsettings.setcpv(pkg, mydb=mydb) |
| 111 |
- if valuesmap["IUSE"].intersection(pkgsettings["PORTAGE_USE"].split()) != \ |
| 112 |
+ if valuesmap["IUSE"].intersection(pkgsettings["USE"].split()) != \ |
| 113 |
valuesmap["USE"]: |
| 114 |
diff_values["USE"] = valuesmap["USE"] |
| 115 |
# If a difference was found, print the info for |
| 116 |
|
| 117 |
Modified: main/trunk/pym/portage/__init__.py |
| 118 |
=================================================================== |
| 119 |
--- main/trunk/pym/portage/__init__.py 2008-02-27 16:02:34 UTC (rev 9390) |
| 120 |
+++ main/trunk/pym/portage/__init__.py 2008-02-27 16:16:30 UTC (rev 9391) |
| 121 |
@@ -2135,7 +2135,7 @@ |
| 122 |
return |
| 123 |
if isinstance(mydbapi, portdbapi): |
| 124 |
self.setcpv(mycpv, mydb=mydbapi) |
| 125 |
- myuse = self["PORTAGE_USE"] |
| 126 |
+ myuse = self["USE"] |
| 127 |
elif isinstance(mydbapi, dict): |
| 128 |
myuse = mydbapi["USE"] |
| 129 |
else: |
| 130 |
@@ -2700,7 +2700,7 @@ |
| 131 |
def selinux_enabled(self): |
| 132 |
if getattr(self, "_selinux_enabled", None) is None: |
| 133 |
self._selinux_enabled = 0 |
| 134 |
- if "selinux" in self["PORTAGE_USE"].split(): |
| 135 |
+ if "selinux" in self["USE"].split(): |
| 136 |
if "selinux" in globals(): |
| 137 |
if selinux.is_selinux_enabled() == 1: |
| 138 |
self._selinux_enabled = 1 |
| 139 |
@@ -5393,7 +5393,7 @@ |
| 140 |
if use=="yes": |
| 141 |
if myuse is None: |
| 142 |
#default behavior |
| 143 |
- myusesplit = mysettings["PORTAGE_USE"].split() |
| 144 |
+ myusesplit = mysettings["USE"].split() |
| 145 |
else: |
| 146 |
myusesplit = myuse |
| 147 |
# We've been given useflags to use. |
| 148 |
@@ -5718,7 +5718,7 @@ |
| 149 |
return ["corruption"] |
| 150 |
if "?" in metadata["LICENSE"]: |
| 151 |
settings.setcpv(p, mydb=metadata) |
| 152 |
- metadata["USE"] = settings["PORTAGE_USE"] |
| 153 |
+ metadata["USE"] = settings.get("USE", "") |
| 154 |
else: |
| 155 |
metadata["USE"] = "" |
| 156 |
mycp=mysplit[0]+"/"+mysplit[1] |
| 157 |
|
| 158 |
-- |
| 159 |
gentoo-commits@l.g.o mailing list |
Archives