Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 71424 Details for
Bug 84884
[PATCH] Misc. use.[local.]desc enhancements
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
portage-2.0-svn20051024-use_desc-emerge.patch
portage-2.0-svn20051024-use_desc-emerge.patch (text/plain), 4.02 KB, created by
TGL
on 2005-10-25 10:02:57 UTC
(
hide
)
Description:
portage-2.0-svn20051024-use_desc-emerge.patch
Filename:
MIME Type:
Creator:
TGL
Created:
2005-10-25 10:02:57 UTC
Size:
4.02 KB
patch
obsolete
>--- bin/emerge.1 2005-10-25 15:31:30.000000000 +0200 >+++ bin/emerge 2005-10-25 15:44:22.000000000 +0200 >@@ -16,6 +16,7 @@ > import portage_util > import portage_locks > import portage_exception >+import portage_use_desc > > > spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")", >@@ -185,6 +186,7 @@ > "--skipfirst", > "--tree", > "--update", "--upgradeonly", >+"--use-desc-all", "--use-desc-local", "--use-desc-special", > "--usepkg", "--usepkgonly", > "--verbose", "--version" > ] >@@ -399,6 +401,28 @@ > portage.writemsg("!!! \"--ask\" should only be used in a terminal. Exiting.\n") > sys.exit(1) > >+# --use-desc-*: only if in verbose pretend/ask mode >+for myoption in ["--use-desc-special", "--use-desc-local", "--use-desc-all"]: >+ if myoption in myopts: >+ if ("--pretend" not in myopts) and ("--ask" not in myopts): >+ print ">>> %s is only for --pretend or --ask modes..." % myoption \ >+ + " removing %s from options." % myoption >+ myopts.remove(myoption) >+ elif "--verbose" not in myopts: >+ print ">>> %s is only for --verbose mode..." % myoption \ >+ + " removing %s from options." % myoption >+ myopts.remove(myoption) >+ >+# --use-desc-*: remove redundant options >+if "--use-desc-all" in myopts: >+ if "--use-desc-local" in myopts: >+ myopts.remove("--use-desc-local") >+ if "--use-desc-special" in myopts: >+ myopts.remove("--use-desc-special") >+if "--use-desc-local" in myopts: >+ if "--use-desc-special" in myopts: >+ myopts.remove("--use-desc-special") >+ > # Set so that configs will be merged regardless of remembered status > if ("--noconfmem" in myopts): > portage.settings.unlock() >@@ -1467,6 +1491,17 @@ > p=[] > totalsize=0 > >+ use_desc=None >+ use_desc_level="" >+ global_desc_dict={} >+ local_desc_dict={} >+ >+ for myoption in ["--use-desc-all", "--use-desc-local", "--use-desc-special"]: >+ if myoption in myopts: >+ use_desc=portage_use_desc.use_desc(portage.settings['PORTDIR']) >+ use_desc_level=myoption[11:] >+ break >+ > if "--verbose" in myopts: > overlays = string.split(portage.settings['PORTDIR_OVERLAY']) > >@@ -1629,6 +1664,25 @@ > else: > verboseadd += "[No ebuild?]" > >+ # --use-desc-*: add new entries to the local and global USE flags >+ # descriptions dictionnaries >+ if iuse_split and use_desc and use_desc_level \ >+ and x[0] == "ebuild" and x[-1]!="nomerge": >+ my_global_desc_dict={} >+ my_local_desc_dict={} >+ mycatpkg=portage.dep_getkey(x[2]) >+ if use_desc_level=="all": >+ my_global_desc_dict=use_desc.get_pkg_flags_desc(iuse_split,mycatpkg,level="global") >+ my_local_desc_dict=use_desc.get_pkg_flags_desc(iuse_split,mycatpkg,level="local") >+ else: # "local" or "special" levels >+ my_local_desc_dict=use_desc.get_pkg_flags_desc(iuse_split,mycatpkg,level=use_desc_level) >+ for myflag in my_global_desc_dict: >+ global_desc_dict[myflag]=my_global_desc_dict[myflag] >+ if my_local_desc_dict and mycatpkg not in local_desc_dict: >+ local_desc_dict[mycatpkg]={} >+ for myflag in my_local_desc_dict: >+ local_desc_dict[mycatpkg][myflag]=my_local_desc_dict[myflag] >+ > xs=portage.pkgsplit(x[2]) > if xs[2]=="r0": > xs[2]="" >@@ -1716,6 +1770,28 @@ > for x in overlays: > y=y+1 > print " "+teal("["+str(y)+"]"),x >+ if global_desc_dict: >+ print >+ print "Global USE flags descriptions:" >+ myflagkeys = global_desc_dict.keys() >+ myflagkeys.sort() >+ for myflag in myflagkeys: >+ print teal(myflag),teal("-"),global_desc_dict[myflag] >+ if local_desc_dict: >+ print >+ if use_desc_level=="special": >+ print "These USE flags have a package-specific description:" >+ else: >+ print "Local USE flags descriptions:" >+ mycatpkgkeys = local_desc_dict.keys() >+ mycatpkgkeys.sort() >+ for mycatpkg in mycatpkgkeys: >+ if local_desc_dict[mycatpkg]: >+ print darkgreen(mycatpkg) >+ myflagkeys = local_desc_dict[mycatpkg].keys() >+ myflagkeys.sort() >+ for myflag in myflagkeys: >+ print " ",teal(myflag),teal("-"),local_desc_dict[mycatpkg][myflag] > > if "--changelog" in myopts: > print
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 84884
:
53193
|
53194
|
53195
|
53196
|
53197
|
53198
|
71423
|
71424
|
71425
|
71426
|
71427
|
71428
|
81282