|
Line
Link Here
|
| 0 |
-- portage/pym/portage.py |
0 |
++ portage/pym/portage.py |
|
Lines 767-772
Link Here
|
| 767 |
self.mycpv = None |
767 |
self.mycpv = None |
| 768 |
self.puseforce = [] |
768 |
self.puseforce = [] |
| 769 |
self.puse = [] |
769 |
self.puse = [] |
|
|
770 |
self.penv = [] |
| 770 |
self.pusemask = [] |
771 |
self.pusemask = [] |
| 771 |
self.modifiedkeys = [] |
772 |
self.modifiedkeys = [] |
| 772 |
self.uvlist = [] |
773 |
self.uvlist = [] |
|
Lines 826-831
Link Here
|
| 826 |
"env": self.configlist[7] } |
827 |
"env": self.configlist[7] } |
| 827 |
self.profiles = copy.deepcopy(clone.profiles) |
828 |
self.profiles = copy.deepcopy(clone.profiles) |
| 828 |
self.backupenv = self.configdict["backupenv"] |
829 |
self.backupenv = self.configdict["backupenv"] |
|
|
830 |
self.penvdict = copy.deepcopy(clone.penvdict) |
| 829 |
self.pusedict = copy.deepcopy(clone.pusedict) |
831 |
self.pusedict = copy.deepcopy(clone.pusedict) |
| 830 |
self.categories = copy.deepcopy(clone.categories) |
832 |
self.categories = copy.deepcopy(clone.categories) |
| 831 |
self.pkeywordsdict = copy.deepcopy(clone.pkeywordsdict) |
833 |
self.pkeywordsdict = copy.deepcopy(clone.pkeywordsdict) |
|
Lines 1080-1085
Link Here
|
| 1080 |
self["ROOT"] = target_root |
1082 |
self["ROOT"] = target_root |
| 1081 |
self.backup_changes("ROOT") |
1083 |
self.backup_changes("ROOT") |
| 1082 |
|
1084 |
|
|
|
1085 |
self.penvdict = {} |
| 1083 |
self.pusedict = {} |
1086 |
self.pusedict = {} |
| 1084 |
self.pkeywordsdict = {} |
1087 |
self.pkeywordsdict = {} |
| 1085 |
self.punmaskdict = {} |
1088 |
self.punmaskdict = {} |
|
Lines 1106-1111
Link Here
|
| 1106 |
if os.environ.get("PORTAGE_CALLER","") != "repoman": |
1109 |
if os.environ.get("PORTAGE_CALLER","") != "repoman": |
| 1107 |
locations.append(abs_user_config) |
1110 |
locations.append(abs_user_config) |
| 1108 |
pmask_locations.append(abs_user_config) |
1111 |
pmask_locations.append(abs_user_config) |
|
|
1112 |
penvdict=grabdict_package( |
| 1113 |
os.path.join(abs_user_config, "package.env"), recursive=1) |
| 1114 |
self.penvdict = {} |
| 1115 |
for key in penvdict.keys(): |
| 1116 |
cp = dep_getkey(key) |
| 1117 |
if not self.penvdict.has_key(cp): |
| 1118 |
self.penvdict[cp] = {} |
| 1119 |
self.penvdict[cp][key] = penvdict[key] |
| 1109 |
pusedict = grabdict_package( |
1120 |
pusedict = grabdict_package( |
| 1110 |
os.path.join(abs_user_config, "package.use"), recursive=1) |
1121 |
os.path.join(abs_user_config, "package.use"), recursive=1) |
| 1111 |
for key in pusedict.keys(): |
1122 |
for key in pusedict.keys(): |
|
Lines 1355-1360
Link Here
|
| 1355 |
if not keeping_pkg: |
1366 |
if not keeping_pkg: |
| 1356 |
self.mycpv = None |
1367 |
self.mycpv = None |
| 1357 |
self.puse = "" |
1368 |
self.puse = "" |
|
|
1369 |
self.penv = "" |
| 1358 |
self.pusemask = [] |
1370 |
self.pusemask = [] |
| 1359 |
self.puseforce = [] |
1371 |
self.puseforce = [] |
| 1360 |
self.configdict["pkg"].clear() |
1372 |
self.configdict["pkg"].clear() |
|
Lines 1411-1416
Link Here
|
| 1411 |
self.pusekey = best_match_to_list(self.mycpv, self.pusedict[cp].keys()) |
1423 |
self.pusekey = best_match_to_list(self.mycpv, self.pusedict[cp].keys()) |
| 1412 |
if self.pusekey: |
1424 |
if self.pusekey: |
| 1413 |
self.puse = " ".join(self.pusedict[cp][self.pusekey]) |
1425 |
self.puse = " ".join(self.pusedict[cp][self.pusekey]) |
|
|
1426 |
self.penv = "" |
| 1427 |
if self.penvdict.has_key(cp): |
| 1428 |
self.penvkey = best_match_to_list(self.mycpv, self.penvdict[cp].keys()) |
| 1429 |
if self.penvkey: |
| 1430 |
self.penv = " ".join(self.penvdict[cp][self.penvkey]) |
| 1414 |
self.pusemask = [] |
1431 |
self.pusemask = [] |
| 1415 |
if cp in self.pusemaskdict: |
1432 |
if cp in self.pusemaskdict: |
| 1416 |
pusemaskkey = best_match_to_list(self.mycpv, |
1433 |
pusemaskkey = best_match_to_list(self.mycpv, |
|
Lines 1423-1432
Link Here
|
| 1423 |
self.puseforcedict[cp].keys()) |
1440 |
self.puseforcedict[cp].keys()) |
| 1424 |
if puseforcekey: |
1441 |
if puseforcekey: |
| 1425 |
self.puseforce = self.puseforcedict[cp][puseforcekey][:] |
1442 |
self.puseforce = self.puseforcedict[cp][puseforcekey][:] |
|
|
1443 |
self.configdict["pkg"].clear() |
| 1426 |
self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file |
1444 |
self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file |
| 1427 |
self.configdict["pkg"]["USE"] = self.puse[:] # this gets appended to USE |
1445 |
self.configdict["pkg"]["USE"] = self.puse[:] # this gets appended to USE |
| 1428 |
# CATEGORY is essential for doebuild calls |
1446 |
# CATEGORY is essential for doebuild calls |
| 1429 |
self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0] |
1447 |
self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0] |
|
|
1448 |
for envname in self.penv.split(): |
| 1449 |
penvfile = USER_CONFIG_PATH + "/env/" + envname |
| 1450 |
if not os.access(penvfile, os.R_OK): |
| 1451 |
writemsg("!!! Can't access package.env file %s\n" % penvfile) |
| 1452 |
else: |
| 1453 |
penvconfig = getconfig(penvfile) |
| 1454 |
if penvconfig is None: |
| 1455 |
writemsg("!!! Parsing error in %s\n" % penvfile) |
| 1456 |
else: |
| 1457 |
for penv in penvconfig.keys(): |
| 1458 |
if penv in self.configdict["pkg"] and penv in INCREMENTALS: |
| 1459 |
self.configdict["pkg"][penv] += " "+penvconfig[penv] |
| 1460 |
else: |
| 1461 |
self.configdict["pkg"][penv] = penvconfig[penv] |
| 1430 |
self.reset(keeping_pkg=1,use_cache=use_cache) |
1462 |
self.reset(keeping_pkg=1,use_cache=use_cache) |
| 1431 |
|
1463 |
|
| 1432 |
def setinst(self,mycpv,mydbapi): |
1464 |
def setinst(self,mycpv,mydbapi): |
