|
Lines 16-21
Link Here
|
| 16 |
import portage_util |
16 |
import portage_util |
| 17 |
import portage_locks |
17 |
import portage_locks |
| 18 |
import portage_exception |
18 |
import portage_exception |
|
|
19 |
import portage_use_desc |
| 19 |
|
20 |
|
| 20 |
|
21 |
|
| 21 |
spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")", |
22 |
spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")", |
|
Lines 185-190
Link Here
|
| 185 |
"--skipfirst", |
186 |
"--skipfirst", |
| 186 |
"--tree", |
187 |
"--tree", |
| 187 |
"--update", "--upgradeonly", |
188 |
"--update", "--upgradeonly", |
|
|
189 |
"--use-desc-all", "--use-desc-local", "--use-desc-special", |
| 188 |
"--usepkg", "--usepkgonly", |
190 |
"--usepkg", "--usepkgonly", |
| 189 |
"--verbose", "--version" |
191 |
"--verbose", "--version" |
| 190 |
] |
192 |
] |
|
Lines 399-404
Link Here
|
| 399 |
portage.writemsg("!!! \"--ask\" should only be used in a terminal. Exiting.\n") |
401 |
portage.writemsg("!!! \"--ask\" should only be used in a terminal. Exiting.\n") |
| 400 |
sys.exit(1) |
402 |
sys.exit(1) |
| 401 |
|
403 |
|
|
|
404 |
# --use-desc-*: only if in verbose pretend/ask mode |
| 405 |
for myoption in ["--use-desc-special", "--use-desc-local", "--use-desc-all"]: |
| 406 |
if myoption in myopts: |
| 407 |
if ("--pretend" not in myopts) and ("--ask" not in myopts): |
| 408 |
print ">>> %s is only for --pretend or --ask modes..." % myoption \ |
| 409 |
+ " removing %s from options." % myoption |
| 410 |
myopts.remove(myoption) |
| 411 |
elif "--verbose" not in myopts: |
| 412 |
print ">>> %s is only for --verbose mode..." % myoption \ |
| 413 |
+ " removing %s from options." % myoption |
| 414 |
myopts.remove(myoption) |
| 415 |
|
| 416 |
# --use-desc-*: remove redundant options |
| 417 |
if "--use-desc-all" in myopts: |
| 418 |
if "--use-desc-local" in myopts: |
| 419 |
myopts.remove("--use-desc-local") |
| 420 |
if "--use-desc-special" in myopts: |
| 421 |
myopts.remove("--use-desc-special") |
| 422 |
if "--use-desc-local" in myopts: |
| 423 |
if "--use-desc-special" in myopts: |
| 424 |
myopts.remove("--use-desc-special") |
| 425 |
|
| 402 |
# Set so that configs will be merged regardless of remembered status |
426 |
# Set so that configs will be merged regardless of remembered status |
| 403 |
if ("--noconfmem" in myopts): |
427 |
if ("--noconfmem" in myopts): |
| 404 |
portage.settings.unlock() |
428 |
portage.settings.unlock() |
|
Lines 1467-1472
Link Here
|
| 1467 |
p=[] |
1491 |
p=[] |
| 1468 |
totalsize=0 |
1492 |
totalsize=0 |
| 1469 |
|
1493 |
|
|
|
1494 |
use_desc=None |
| 1495 |
use_desc_level="" |
| 1496 |
global_desc_dict={} |
| 1497 |
local_desc_dict={} |
| 1498 |
|
| 1499 |
for myoption in ["--use-desc-all", "--use-desc-local", "--use-desc-special"]: |
| 1500 |
if myoption in myopts: |
| 1501 |
use_desc=portage_use_desc.use_desc(portage.settings['PORTDIR']) |
| 1502 |
use_desc_level=myoption[11:] |
| 1503 |
break |
| 1504 |
|
| 1470 |
if "--verbose" in myopts: |
1505 |
if "--verbose" in myopts: |
| 1471 |
overlays = string.split(portage.settings['PORTDIR_OVERLAY']) |
1506 |
overlays = string.split(portage.settings['PORTDIR_OVERLAY']) |
| 1472 |
|
1507 |
|
|
Lines 1629-1634
Link Here
|
| 1629 |
else: |
1664 |
else: |
| 1630 |
verboseadd += "[No ebuild?]" |
1665 |
verboseadd += "[No ebuild?]" |
| 1631 |
|
1666 |
|
|
|
1667 |
# --use-desc-*: add new entries to the local and global USE flags |
| 1668 |
# descriptions dictionnaries |
| 1669 |
if iuse_split and use_desc and use_desc_level \ |
| 1670 |
and x[0] == "ebuild" and x[-1]!="nomerge": |
| 1671 |
my_global_desc_dict={} |
| 1672 |
my_local_desc_dict={} |
| 1673 |
mycatpkg=portage.dep_getkey(x[2]) |
| 1674 |
if use_desc_level=="all": |
| 1675 |
my_global_desc_dict=use_desc.get_pkg_flags_desc(iuse_split,mycatpkg,level="global") |
| 1676 |
my_local_desc_dict=use_desc.get_pkg_flags_desc(iuse_split,mycatpkg,level="local") |
| 1677 |
else: # "local" or "special" levels |
| 1678 |
my_local_desc_dict=use_desc.get_pkg_flags_desc(iuse_split,mycatpkg,level=use_desc_level) |
| 1679 |
for myflag in my_global_desc_dict: |
| 1680 |
global_desc_dict[myflag]=my_global_desc_dict[myflag] |
| 1681 |
if my_local_desc_dict and mycatpkg not in local_desc_dict: |
| 1682 |
local_desc_dict[mycatpkg]={} |
| 1683 |
for myflag in my_local_desc_dict: |
| 1684 |
local_desc_dict[mycatpkg][myflag]=my_local_desc_dict[myflag] |
| 1685 |
|
| 1632 |
xs=portage.pkgsplit(x[2]) |
1686 |
xs=portage.pkgsplit(x[2]) |
| 1633 |
if xs[2]=="r0": |
1687 |
if xs[2]=="r0": |
| 1634 |
xs[2]="" |
1688 |
xs[2]="" |
|
Lines 1716-1721
Link Here
|
| 1716 |
for x in overlays: |
1770 |
for x in overlays: |
| 1717 |
y=y+1 |
1771 |
y=y+1 |
| 1718 |
print " "+teal("["+str(y)+"]"),x |
1772 |
print " "+teal("["+str(y)+"]"),x |
|
|
1773 |
if global_desc_dict: |
| 1774 |
print |
| 1775 |
print "Global USE flags descriptions:" |
| 1776 |
myflagkeys = global_desc_dict.keys() |
| 1777 |
myflagkeys.sort() |
| 1778 |
for myflag in myflagkeys: |
| 1779 |
print teal(myflag),teal("-"),global_desc_dict[myflag] |
| 1780 |
if local_desc_dict: |
| 1781 |
print |
| 1782 |
if use_desc_level=="special": |
| 1783 |
print "These USE flags have a package-specific description:" |
| 1784 |
else: |
| 1785 |
print "Local USE flags descriptions:" |
| 1786 |
mycatpkgkeys = local_desc_dict.keys() |
| 1787 |
mycatpkgkeys.sort() |
| 1788 |
for mycatpkg in mycatpkgkeys: |
| 1789 |
if local_desc_dict[mycatpkg]: |
| 1790 |
print darkgreen(mycatpkg) |
| 1791 |
myflagkeys = local_desc_dict[mycatpkg].keys() |
| 1792 |
myflagkeys.sort() |
| 1793 |
for myflag in myflagkeys: |
| 1794 |
print " ",teal(myflag),teal("-"),local_desc_dict[mycatpkg][myflag] |
| 1719 |
|
1795 |
|
| 1720 |
if "--changelog" in myopts: |
1796 |
if "--changelog" in myopts: |
| 1721 |
print |
1797 |
print |
