Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 120315 Details for
Bug 179766
portage-2.1.2.8 USE="-*" destroys USE_EXPAND variables
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
allow USE_EXPAND variables to survive USE="-*" when appropriate
use_expand.patch (text/plain), 2.43 KB, created by
Zac Medico
on 2007-05-25 19:20:45 UTC
(
hide
)
Description:
allow USE_EXPAND variables to survive USE="-*" when appropriate
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2007-05-25 19:20:45 UTC
Size:
2.43 KB
patch
obsolete
>Index: pym/portage.py >=================================================================== >--- pym/portage.py (revision 6623) >+++ pym/portage.py (revision 6624) >@@ -1860,26 +1860,7 @@ > else: > self.configdict["auto"]["USE"] = "" > >- use_expand_protected = [] > use_expand = self.get("USE_EXPAND", "").split() >- for var in use_expand: >- var_lower = var.lower() >- for x in self.get(var, "").split(): >- # Any incremental USE_EXPAND variables have already been >- # processed, so leading +/- operators are invalid here. >- if x[0] == "+": >- writemsg(colorize("BAD", "Invalid '+' operator in " + \ >- "non-incremental variable '%s': '%s'\n" % (var, x)), >- noiselevel=-1) >- x = x[1:] >- if x[0] == "-": >- writemsg(colorize("BAD", "Invalid '-' operator in " + \ >- "non-incremental variable '%s': '%s'\n" % (var, x)), >- noiselevel=-1) >- continue >- mystr = var_lower + "_" + x >- if mystr not in use_expand_protected: >- use_expand_protected.append(mystr) > > if not self.uvlist: > for x in self["USE_ORDER"].split(":"): >@@ -1887,11 +1868,12 @@ > self.uvlist.append(self.configdict[x]) > self.uvlist.reverse() > >- myflags = use_expand_protected[:] >+ myflags = [] > for curdb in self.uvlist: >- if "USE" not in curdb: >+ cur_use_expand = [x for x in use_expand if x in curdb] >+ mysplit = curdb.get("USE", "").split() >+ if not mysplit and not cur_use_expand: > continue >- mysplit = curdb["USE"].split() > for x in mysplit: > if x == "-*": > myflags = [] >@@ -1911,9 +1893,28 @@ > pass > continue > >- if x not in myflags: >- myflags.append(x) >+ myflags.append(x) > >+ for var in cur_use_expand: >+ var_lower = var.lower() >+ if var not in myincrementals: >+ prefix = var_lower + "_" >+ myflags = [x for x in myflags if not x.startswith(prefix)] >+ for x in curdb[var].split(): >+ # Any incremental USE_EXPAND variables have already been >+ # processed, so leading +/- operators are invalid here. >+ if x[0] == "+": >+ writemsg(colorize("BAD", "Invalid '+' operator in " + \ >+ "non-incremental variable '%s': '%s'\n" % (var, x)), >+ noiselevel=-1) >+ x = x[1:] >+ if x[0] == "-": >+ writemsg(colorize("BAD", "Invalid '-' operator in " + \ >+ "non-incremental variable '%s': '%s'\n" % (var, x)), >+ noiselevel=-1) >+ continue >+ myflags.append(var_lower + "_" + x) >+ > myflags = set(myflags) > myflags.update(self.useforce) >
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 179766
: 120315