/[gentoo-src]/portage/pym/portage_config.py
Gentoo

Diff of /portage/pym/portage_config.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1.2.1 Revision 1.1.2.2
20 self.ctx = ctx 20 self.ctx = ctx
21 21
22 self.usesplit=[] 22 self.usesplit=[]
23 self.cexpand={} 23 self.cexpand={}
24 24
25 self.usemasks=[] 25 self.usemask=[]
26 self.configlist=[] 26 self.configlist=[]
27 self.backupenv={} 27 self.backupenv={}
28 # back up our incremental variables: 28 # back up our incremental variables:
29 self.configdict={} 29 self.configdict={}
30 # configlist will contain: [ globals, (optional) profile, make.conf, backupenv (incrementals), origenv ] 30 # configlist will contain: [ globals, (optional) profile, make.conf, backupenv (incrementals), origenv ]
31 31
32 #get the masked use flags 32 #get the masked use flags
33 if os.path.exists("/etc/make.profile/use.mask"): 33 if os.path.exists("/etc/make.profile/use.mask"):
34 usemasks=grabfile("/etc/make.profile/use.mask") 34 self.usemask=grabfile("/etc/make.profile/use.mask")
35 if os.path.exists("/etc/portage/use.mask"): 35 if os.path.exists("/etc/portage/use.mask"):
36 usemasks=usemasks+grabfile("/etc/portage/use.mask") 36 self.usemask=self.usemask+grabfile("/etc/portage/use.mask")
37 37
38 self.mygcfg=self.getconfig("/etc/make.globals") 38 self.mygcfg=self.getconfig("/etc/make.globals")
39 if self.mygcfg==None: 39 if self.mygcfg==None:
40 print "!!! Parse error in /etc/make.globals. NEVER EDIT THIS FILE." 40 print "!!! Parse error in /etc/make.globals. NEVER EDIT THIS FILE."
41 print "!!! Incorrect multiline literals can cause this. Do not use them." 41 print "!!! Incorrect multiline literals can cause this. Do not use them."
130 #store setting in last element of configlist, the original environment: 130 #store setting in last element of configlist, the original environment:
131 self.configlist[-1][mykey]=string.join(mysetting," ") 131 self.configlist[-1][mykey]=string.join(mysetting," ")
132 #cache split-up USE var in a global 132 #cache split-up USE var in a global
133 self.usesplit=[] 133 self.usesplit=[]
134 for x in string.split(self.configlist[-1]["USE"]): 134 for x in string.split(self.configlist[-1]["USE"]):
135 if x not in self.usemasks: 135 if x not in self.usemask:
136 self.usesplit.append(x) 136 self.usesplit.append(x)
137 137
138 # Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch. 138 # Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch.
139 if self.ctx.getProfileDir(): 139 if self.ctx.getProfileDir():
140 if self.configdict["defaults"].has_key("ARCH"): 140 if self.configdict["defaults"].has_key("ARCH"):

Legend:
Removed from v.1.1.2.1  
changed lines
  Added in v.1.1.2.2

  ViewVC Help
Powered by ViewVC 1.1.20