|
Lines 650-656
Link Here
|
| 650 |
if self.target_root != "/": |
650 |
if self.target_root != "/": |
| 651 |
self.pkgsettings["/"] = \ |
651 |
self.pkgsettings["/"] = \ |
| 652 |
portage.config(clone=trees["/"]["vartree"].settings) |
652 |
portage.config(clone=trees["/"]["vartree"].settings) |
| 653 |
self.applied_useflags = {} |
653 |
self.useFlags = {} |
|
|
654 |
self.useFlags[self.target_root] = {} |
| 655 |
if self.target_root != "/": |
| 656 |
self.useFlags["/"] = {} |
| 654 |
|
657 |
|
| 655 |
self.missingbins=[] |
658 |
self.missingbins=[] |
| 656 |
self.digraph=portage.digraph() |
659 |
self.digraph=portage.digraph() |
|
Lines 727-733
Link Here
|
| 727 |
if myuse is None: |
730 |
if myuse is None: |
| 728 |
self.pkgsettings[myroot].setcpv(mykey) |
731 |
self.pkgsettings[myroot].setcpv(mykey) |
| 729 |
myuse = self.pkgsettings[myroot]["USE"].split() |
732 |
myuse = self.pkgsettings[myroot]["USE"].split() |
| 730 |
self.applied_useflags[mykey] = myuse |
733 |
self.useFlags[myroot][mykey] = myuse |
| 731 |
|
734 |
|
| 732 |
merging=1 |
735 |
merging=1 |
| 733 |
if addme: |
736 |
if addme: |
|
Lines 1364-1375
Link Here
|
| 1364 |
vartree = self.trees[myroot]["vartree"] |
1367 |
vartree = self.trees[myroot]["vartree"] |
| 1365 |
pkgsettings = self.pkgsettings[myroot] |
1368 |
pkgsettings = self.pkgsettings[myroot] |
| 1366 |
pkgsettings.setcpv(pkg_key) |
1369 |
pkgsettings.setcpv(pkg_key) |
| 1367 |
if pkg_key not in self.applied_useflags: |
1370 |
if pkg_key not in self.useFlags[myroot]: |
| 1368 |
if "binary" == pkg_type: |
1371 |
if "binary" == pkg_type: |
| 1369 |
self.applied_useflags[pkg_key] = bindb.aux_get( |
1372 |
self.useFlags[myroot][pkg_key] = bindb.aux_get( |
| 1370 |
pkg_key, ["USE"])[0].split() |
1373 |
pkg_key, ["USE"])[0].split() |
| 1371 |
elif "ebuild" == pkg_type: |
1374 |
elif "ebuild" == pkg_type: |
| 1372 |
self.applied_useflags[pkg_key] = pkgsettings["USE"].split() |
1375 |
self.useFlags[myroot][pkg_key] = pkgsettings["USE"].split() |
| 1373 |
|
1376 |
|
| 1374 |
fetch=" " |
1377 |
fetch=" " |
| 1375 |
|
1378 |
|
|
Lines 1393-1399
Link Here
|
| 1393 |
x[2], ["RESTRICT"])[0].split(): |
1396 |
x[2], ["RESTRICT"])[0].split(): |
| 1394 |
fetch = red("F") |
1397 |
fetch = red("F") |
| 1395 |
if portdb.fetch_check( |
1398 |
if portdb.fetch_check( |
| 1396 |
x[2], self.applied_useflags[x[2]]): |
1399 |
pkg_key, self.useFlags[myroot][pkg_key]): |
| 1397 |
fetch = green("f") |
1400 |
fetch = green("f") |
| 1398 |
|
1401 |
|
| 1399 |
#we need to use "--emptrytree" testing here rather than "empty" param testing because "empty" |
1402 |
#we need to use "--emptrytree" testing here rather than "empty" param testing because "empty" |
|
Lines 1437-1443
Link Here
|
| 1437 |
|
1440 |
|
| 1438 |
verboseadd="" |
1441 |
verboseadd="" |
| 1439 |
|
1442 |
|
| 1440 |
if x[2] in self.applied_useflags: |
1443 |
if pkg_key in self.useFlags[myroot]: |
| 1441 |
# USE flag display |
1444 |
# USE flag display |
| 1442 |
if x[0] == "binary": |
1445 |
if x[0] == "binary": |
| 1443 |
cur_iuse = bindb.aux_get(pkg_key, ["IUSE"])[0].split() |
1446 |
cur_iuse = bindb.aux_get(pkg_key, ["IUSE"])[0].split() |
|
Lines 1451-1457
Link Here
|
| 1451 |
if flag not in pkgsettings.usemask \ |
1454 |
if flag not in pkgsettings.usemask \ |
| 1452 |
and flag not in pkgsettings.pusemask] |
1455 |
and flag not in pkgsettings.pusemask] |
| 1453 |
cur_iuse.sort() |
1456 |
cur_iuse.sort() |
| 1454 |
cur_use = self.applied_useflags[x[2]] |
1457 |
cur_use = self.useFlags[myroot][pkg_key] |
| 1455 |
cur_use = [flag for flag in cur_use if flag in cur_iuse] |
1458 |
cur_use = [flag for flag in cur_use if flag in cur_iuse] |
| 1456 |
|
1459 |
|
| 1457 |
if myoldbest: |
1460 |
if myoldbest: |
|
Lines 1514-1520
Link Here
|
| 1514 |
mysize=0 |
1517 |
mysize=0 |
| 1515 |
if x[0] == "ebuild" and x[-1]!="nomerge": |
1518 |
if x[0] == "ebuild" and x[-1]!="nomerge": |
| 1516 |
myfilesdict = portdb.getfetchsizes( |
1519 |
myfilesdict = portdb.getfetchsizes( |
| 1517 |
x[2], useflags=self.applied_useflags[x[2]], |
1520 |
pkg_key, useflags=self.useFlags[myroot][pkg_key], |
| 1518 |
debug=self.edebug) |
1521 |
debug=self.edebug) |
| 1519 |
if myfilesdict is None: |
1522 |
if myfilesdict is None: |
| 1520 |
myfilesdict="[empty/missing/bad digest]" |
1523 |
myfilesdict="[empty/missing/bad digest]" |
