|
Lines 403-411
Link Here
|
| 403 |
portage.settings.lock() |
403 |
portage.settings.lock() |
| 404 |
|
404 |
|
| 405 |
if ("--resume" in myopts): |
405 |
if ("--resume" in myopts): |
| 406 |
if "--verbose" in myopts: |
|
|
| 407 |
print "* --verbose is currently broken with --resume. Disabling..." |
| 408 |
myopts.remove("--verbose") |
| 409 |
if "--tree" in myopts: |
406 |
if "--tree" in myopts: |
| 410 |
print "* --tree is currently broken with --resume. Disabling..." |
407 |
print "* --tree is currently broken with --resume. Disabling..." |
| 411 |
myopts.remove("--tree") |
408 |
myopts.remove("--tree") |
|
Lines 1514-1519
Link Here
|
| 1514 |
# in size display (verbose mode) |
1511 |
# in size display (verbose mode) |
| 1515 |
myfetchlist=[] |
1512 |
myfetchlist=[] |
| 1516 |
for x in mylist: |
1513 |
for x in mylist: |
|
|
1514 |
pkg_type = x[0] |
| 1515 |
pkg_key = x[2] |
| 1516 |
if pkg_key not in self.applied_useflags: |
| 1517 |
if "binary" == pkg_type: |
| 1518 |
self.applied_useflags[pkg_key] = portage.db["/"]["bintree"].dbapi.aux_get(pkg_key, ["USE"])[0].split() |
| 1519 |
elif "ebuild" == pkg_type: |
| 1520 |
self.pkgsettings.setcpv(pkg_key) |
| 1521 |
self.applied_useflags[pkg_key] = self.pkgsettings["USE"].split() |
| 1522 |
|
| 1517 |
fetch=" " |
1523 |
fetch=" " |
| 1518 |
|
1524 |
|
| 1519 |
if x[0]=="blocks": |
1525 |
if x[0]=="blocks": |
|
Lines 3151-3157
Link Here
|
| 3151 |
portage.commit_mtimedb() |
3157 |
portage.commit_mtimedb() |
| 3152 |
myresumeopts=portage.mtimedb["resume"]["myopts"][:] |
3158 |
myresumeopts=portage.mtimedb["resume"]["myopts"][:] |
| 3153 |
|
3159 |
|
| 3154 |
for opt in ("--skipfirst", "--ask", "--verbose", "--tree"): |
3160 |
for opt in ("--skipfirst", "--ask", "--tree"): |
| 3155 |
while opt in myresumeopts: |
3161 |
while opt in myresumeopts: |
| 3156 |
myresumeopts.remove(opt) |
3162 |
myresumeopts.remove(opt) |
| 3157 |
|
3163 |
|
