summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/__init__.py22
-rw-r--r--pym/portage/__init__.py8
2 files changed, 15 insertions, 15 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 06737ed3a..4b407f034 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1103,7 +1103,7 @@ def get_mask_info(root_config, cpv, pkgsettings,
metadata = None
if metadata and not built:
pkgsettings.setcpv(cpv, mydb=metadata)
- metadata["USE"] = pkgsettings["PORTAGE_USE"]
+ metadata["USE"] = pkgsettings.get("USE", "")
if metadata is None:
mreasons = ["corruption"]
else:
@@ -2119,7 +2119,7 @@ class depgraph(object):
metadata = dict(izip(self._mydbapi_keys,
portdb.aux_get(mykey, self._mydbapi_keys)))
pkgsettings.setcpv(mykey, mydb=metadata)
- metadata["USE"] = pkgsettings["PORTAGE_USE"]
+ metadata["USE"] = pkgsettings["USE"]
pkg = Package(type_name="ebuild", root=myroot,
cpv=mykey, metadata=metadata, onlydeps=onlydeps)
args.append(PackageArg(arg=x, package=pkg,
@@ -2427,7 +2427,7 @@ class depgraph(object):
if not built:
if (is_virt or "?" in metadata["LICENSE"]):
pkgsettings.setcpv(cpv, mydb=metadata)
- metadata["USE"] = pkgsettings["PORTAGE_USE"]
+ metadata["USE"] = pkgsettings["USE"]
else:
metadata["USE"] = ""
@@ -2615,7 +2615,7 @@ class depgraph(object):
if not built:
if "?" in metadata["LICENSE"]:
pkgsettings.setcpv(cpv, mydb=metadata)
- metadata["USE"] = pkgsettings["PORTAGE_USE"]
+ metadata["USE"] = pkgsettings.get("USE","")
else:
metadata["USE"] = ""
myarg = None
@@ -2672,7 +2672,7 @@ class depgraph(object):
pkgsettings.setcpv(myeb, mydb=mydb)
else:
pkgsettings.setcpv(cpv, mydb=mydb)
- now_use = pkgsettings["PORTAGE_USE"].split()
+ now_use = pkgsettings["USE"].split()
forced_flags = set()
forced_flags.update(pkgsettings.useforce)
forced_flags.update(pkgsettings.usemask)
@@ -2698,7 +2698,7 @@ class depgraph(object):
old_use = vardb.aux_get(cpv, ["USE"])[0].split()
old_iuse = set(filter_iuse_defaults(
vardb.aux_get(cpv, ["IUSE"])[0].split()))
- cur_use = pkgsettings["PORTAGE_USE"].split()
+ cur_use = pkgsettings["USE"].split()
cur_iuse = set(filter_iuse_defaults(
metadata["IUSE"].split()))
reinstall_for_flags = \
@@ -2729,7 +2729,7 @@ class depgraph(object):
db.aux_get(cpv, self._mydbapi_keys)))
if not built:
pkgsettings.setcpv(cpv, mydb=metadata)
- metadata["USE"] = pkgsettings["PORTAGE_USE"]
+ metadata["USE"] = pkgsettings.get("USE","")
myeb = cpv
matched_packages.append(
Package(type_name=pkg_type, root=root,
@@ -3652,7 +3652,7 @@ class depgraph(object):
repo_path_real = os.path.dirname(os.path.dirname(
os.path.dirname(ebuild_path)))
pkgsettings.setcpv(pkg_key, mydb=mydbapi)
- metadata["USE"] = pkgsettings["PORTAGE_USE"]
+ metadata["USE"] = pkgsettings["USE"]
else:
repo_path_real = portdb.getRepositoryPath(repo_name)
pkg_use = metadata["USE"].split()
@@ -4242,7 +4242,7 @@ class depgraph(object):
if pkg_type == "ebuild":
pkgsettings = self.pkgsettings[myroot]
pkgsettings.setcpv(pkg_key, mydb=fakedb[myroot])
- fakedb[myroot].aux_update(pkg_key, {"USE":pkgsettings["PORTAGE_USE"]})
+ fakedb[myroot].aux_update(pkg_key, {"USE":pkgsettings["USE"]})
self.spinner.update()
class RepoDisplay(object):
@@ -4532,7 +4532,7 @@ class MergeTask(object):
metadata.update(izip(metadata_keys,
mydbapi.aux_get(pkg_key, metadata_keys)))
pkgsettings.setcpv(pkg_key, mydb=mydbapi)
- metadata["USE"] = pkgsettings["PORTAGE_USE"]
+ metadata["USE"] = pkgsettings["USE"]
else:
if pkg_type == "binary":
mydbapi = bindb
@@ -6282,7 +6282,7 @@ def action_info(settings, trees, myopts, myfiles):
if portdb.cpv_exists(pkg):
mydb = portdb
pkgsettings.setcpv(pkg, mydb=mydb)
- if valuesmap["IUSE"].intersection(pkgsettings["PORTAGE_USE"].split()) != \
+ if valuesmap["IUSE"].intersection(pkgsettings["USE"].split()) != \
valuesmap["USE"]:
diff_values["USE"] = valuesmap["USE"]
# If a difference was found, print the info for
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 7743ea385..8bc7a8c82 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2135,7 +2135,7 @@ class config(object):
return
if isinstance(mydbapi, portdbapi):
self.setcpv(mycpv, mydb=mydbapi)
- myuse = self["PORTAGE_USE"]
+ myuse = self["USE"]
elif isinstance(mydbapi, dict):
myuse = mydbapi["USE"]
else:
@@ -2700,7 +2700,7 @@ class config(object):
def selinux_enabled(self):
if getattr(self, "_selinux_enabled", None) is None:
self._selinux_enabled = 0
- if "selinux" in self["PORTAGE_USE"].split():
+ if "selinux" in self["USE"].split():
if "selinux" in globals():
if selinux.is_selinux_enabled() == 1:
self._selinux_enabled = 1
@@ -5393,7 +5393,7 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None,
if use=="yes":
if myuse is None:
#default behavior
- myusesplit = mysettings["PORTAGE_USE"].split()
+ myusesplit = mysettings["USE"].split()
else:
myusesplit = myuse
# We've been given useflags to use.
@@ -5718,7 +5718,7 @@ def getmaskingstatus(mycpv, settings=None, portdb=None):
return ["corruption"]
if "?" in metadata["LICENSE"]:
settings.setcpv(p, mydb=metadata)
- metadata["USE"] = settings["PORTAGE_USE"]
+ metadata["USE"] = settings.get("USE", "")
else:
metadata["USE"] = ""
mycp=mysplit[0]+"/"+mysplit[1]