|
Line
Link Here
|
| 0 |
-- pym/portage.py |
0 |
++ pym/portage.py |
|
Lines 1679-1684
Link Here
|
| 1679 |
cp = dep_getkey(mycpv) |
1679 |
cp = dep_getkey(mycpv) |
| 1680 |
cpv_slot = self.mycpv |
1680 |
cpv_slot = self.mycpv |
| 1681 |
pkginternaluse = "" |
1681 |
pkginternaluse = "" |
|
|
1682 |
iuse = "" |
| 1682 |
if mydb: |
1683 |
if mydb: |
| 1683 |
slot, iuse = mydb.aux_get(self.mycpv, ["SLOT", "IUSE"]) |
1684 |
slot, iuse = mydb.aux_get(self.mycpv, ["SLOT", "IUSE"]) |
| 1684 |
cpv_slot = "%s:%s" % (self.mycpv, slot) |
1685 |
cpv_slot = "%s:%s" % (self.mycpv, slot) |
|
Lines 1739-1744
Link Here
|
| 1739 |
has_changed = True |
1740 |
has_changed = True |
| 1740 |
self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file |
1741 |
self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file |
| 1741 |
self.configdict["pkg"]["USE"] = self.puse[:] # this gets appended to USE |
1742 |
self.configdict["pkg"]["USE"] = self.puse[:] # this gets appended to USE |
|
|
1743 |
if iuse != self.configdict["pkg"].get("IUSE"): |
| 1744 |
self.configdict["pkg"]["IUSE"] = iuse |
| 1745 |
has_changed = True |
| 1742 |
# CATEGORY is essential for doebuild calls |
1746 |
# CATEGORY is essential for doebuild calls |
| 1743 |
self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0] |
1747 |
self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0] |
| 1744 |
if has_changed: |
1748 |
if has_changed: |
|
Lines 1960-1965
Link Here
|
| 1960 |
# exports them as empty. This is required for vars such as |
1964 |
# exports them as empty. This is required for vars such as |
| 1961 |
# LINGUAS, where unset and empty have different meanings. |
1965 |
# LINGUAS, where unset and empty have different meanings. |
| 1962 |
self[var] = " ".join(var_split) |
1966 |
self[var] = " ".join(var_split) |
|
|
1967 |
else: |
| 1968 |
# if unset, we enable everything in IUSE that's not masked |
| 1969 |
iuse = self.configdict["pkg"].get("IUSE") |
| 1970 |
if iuse: |
| 1971 |
var_split = [] |
| 1972 |
for x in iuse.split(): |
| 1973 |
x = x.lstrip("+-") |
| 1974 |
if x.startswith(prefix) and x not in self.usemask: |
| 1975 |
var_split.append(x[prefix_len:]) |
| 1976 |
usesplit.append(x) |
| 1977 |
if var_split: |
| 1978 |
self[var] = " ".join(var_split) |
| 1979 |
usesplit.sort() |
| 1963 |
|
1980 |
|
| 1964 |
# Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch. |
1981 |
# Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch. |
| 1965 |
if self.configdict["defaults"].has_key("ARCH"): |
1982 |
if self.configdict["defaults"].has_key("ARCH"): |
