|
Lines 3234-3240
Link Here
|
| 3234 |
self.xcache={} |
3234 |
self.xcache={} |
| 3235 |
self.frozen=0 |
3235 |
self.frozen=0 |
| 3236 |
#oroot="overlay root" |
3236 |
#oroot="overlay root" |
| 3237 |
self.oroot=None |
3237 |
self.oroot=[] |
| 3238 |
|
3238 |
|
| 3239 |
def findname(self,mycpv): |
3239 |
def findname(self,mycpv): |
| 3240 |
"returns file location for this particular package" |
3240 |
"returns file location for this particular package" |
|
Lines 3247-3254
Link Here
|
| 3247 |
sys.exit(1) |
3247 |
sys.exit(1) |
| 3248 |
|
3248 |
|
| 3249 |
psplit=pkgsplit(mysplit[1]) |
3249 |
psplit=pkgsplit(mysplit[1]) |
| 3250 |
if self.oroot: |
3250 |
for od in self.oroot: |
| 3251 |
myloc=self.oroot+"/"+mysplit[0]+"/"+psplit[0]+"/"+mysplit[1]+".ebuild" |
3251 |
myloc=od+"/"+mysplit[0]+"/"+psplit[0]+"/"+mysplit[1]+".ebuild" |
| 3252 |
try: |
3252 |
try: |
| 3253 |
os.stat(myloc) |
3253 |
os.stat(myloc) |
| 3254 |
return myloc |
3254 |
return myloc |
|
Lines 3488-3495
Link Here
|
| 3488 |
if y=="CVS": |
3488 |
if y=="CVS": |
| 3489 |
continue |
3489 |
continue |
| 3490 |
biglist.append(x+"/"+y) |
3490 |
biglist.append(x+"/"+y) |
| 3491 |
if self.oroot: |
3491 |
for od in self.oroot: |
| 3492 |
for y in listdir(self.oroot+"/"+x,EmptyOnError=1): |
3492 |
for y in listdir(od+"/"+x,EmptyOnError=1): |
| 3493 |
if y=="CVS": |
3493 |
if y=="CVS": |
| 3494 |
continue |
3494 |
continue |
| 3495 |
mykey=x+"/"+y |
3495 |
mykey=x+"/"+y |
|
Lines 3502-3509
Link Here
|
| 3502 |
for x in listdir(self.root+"/"+mycp,EmptyOnError=1): |
3502 |
for x in listdir(self.root+"/"+mycp,EmptyOnError=1): |
| 3503 |
if x[-7:]==".ebuild": |
3503 |
if x[-7:]==".ebuild": |
| 3504 |
returnme.append(x[:-7]) |
3504 |
returnme.append(x[:-7]) |
| 3505 |
if self.oroot: |
3505 |
for od in self.oroot: |
| 3506 |
for x in listdir(self.oroot+"/"+mycp,EmptyOnError=1): |
3506 |
for x in listdir(od+"/"+mycp,EmptyOnError=1): |
| 3507 |
if x[-7:]==".ebuild": |
3507 |
if x[-7:]==".ebuild": |
| 3508 |
mye=x[:-7] |
3508 |
mye=x[:-7] |
| 3509 |
if not mye in returnme: |
3509 |
if not mye in returnme: |
|
Lines 3518-3525
Link Here
|
| 3518 |
for x in list: |
3518 |
for x in list: |
| 3519 |
if x[-7:]==".ebuild": |
3519 |
if x[-7:]==".ebuild": |
| 3520 |
returnme.append(mysplit[0]+"/"+x[:-7]) |
3520 |
returnme.append(mysplit[0]+"/"+x[:-7]) |
| 3521 |
if self.oroot: |
3521 |
for od in self.oroot: |
| 3522 |
list=listdir(self.oroot+"/"+mycp,EmptyOnError=1) |
3522 |
list=listdir(od+"/"+mycp,EmptyOnError=1) |
| 3523 |
if list: |
3523 |
if list: |
| 3524 |
for x in list: |
3524 |
for x in list: |
| 3525 |
if x[-7:]==".ebuild": |
3525 |
if x[-7:]==".ebuild": |
|
Lines 4815-4826
Link Here
|
| 4815 |
#the new standardized db names: |
4815 |
#the new standardized db names: |
| 4816 |
portdb=portdbapi() |
4816 |
portdb=portdbapi() |
| 4817 |
if settings["PORTDIR_OVERLAY"]: |
4817 |
if settings["PORTDIR_OVERLAY"]: |
| 4818 |
if os.path.isdir(settings["PORTDIR_OVERLAY"]): |
4818 |
#grab all overlay dirs |
| 4819 |
portdb.oroot=settings["PORTDIR_OVERLAY"] |
4819 |
overlaylist=string.split(settings["PORTDIR_OVERLAY"], ":") |
| 4820 |
else: |
4820 |
for od in overlaylist: |
| 4821 |
sys.stderr.write("!!! PORTDIR_OVERLAY points to "+settings["PORTDIR_OVERLAY"]+"\n") |
4821 |
if os.path.isdir(od): |
| 4822 |
sys.stderr.write("!!! which isn't a directory... Exiting.\n") |
4822 |
portdb.oroot.append(od) |
| 4823 |
sys.exit(1) |
4823 |
else: |
|
|
4824 |
sys.stderr.write("!!! PORTDIR_OVERLAY points to "+od+"\n") |
| 4825 |
sys.stderr.write("!!! which isn't a directory... Exiting.\n") |
| 4826 |
sys.exit(1) |
| 4824 |
|
4827 |
|
| 4825 |
def portageexit(): |
4828 |
def portageexit(): |
| 4826 |
global uid,portage_gid |
4829 |
global uid,portage_gid |
