Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 49655 Details for
Bug 79509
recent portage fails to resolve virtuals correctly in context of dev-lang/ghc
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Relocates virtuals processing
emerge-2.0.51-r15-bootstrapping-virtuals.patch (text/plain), 1.87 KB, created by
Jason Stubbs (RETIRED)
on 2005-01-27 06:10:53 UTC
(
hide
)
Description:
Relocates virtuals processing
Filename:
MIME Type:
Creator:
Jason Stubbs (RETIRED)
Created:
2005-01-27 06:10:53 UTC
Size:
1.87 KB
patch
obsolete
>Index: emerge >=================================================================== >RCS file: /var/cvsroot/gentoo-src/portage/bin/emerge,v >retrieving revision 1.345.2.13 >diff -u -r1.345.2.13 emerge >--- emerge 16 Jan 2005 02:35:33 -0000 1.345.2.13 >+++ emerge 27 Jan 2005 13:52:25 -0000 >@@ -925,17 +925,9 @@ > merging=2 > if merging==1: > mybigkey.append("merge") >- self.mydbapi[myroot].cpv_inject(mykey) > else: > mybigkey.append("nomerge") > >- # Adjust pkgsettings with any virtuals this package provides. >- if merging!=0: >- if mytype=="binary": >- self.pkgsettings.setinst(mykey,portage.db["/"]["bintree"].dbapi) >- elif merging: >- self.pkgsettings.setinst(mykey,portage.db[myroot]["porttree"].dbapi) >- > # whatever the case, we need to add the node to our digraph so > # that children can depend upon it. > self.digraph.addnode(string.join(mybigkey),myparent) >@@ -1118,12 +1110,30 @@ > #mycheck=portage.dep_check(depstring,self.mydbapi[myroot],self.pkgsettings,myuse=myuse) > > if not mycheck[0]: >- return 0 >- mymerge=mycheck[1] >+ mymerge=[] >+ else: >+ mymerge=mycheck[1] > > else: > #we're processing a command-line argument; unconditionally merge it even if it's already merged > mymerge=[depstring] >+ >+ # dep_check has been run so we can now add our parent to our >+ # build state to update virtuals and other settings. This >+ # happens after the package is added to the tree so that a >+ # package can depend on a virtual which it satisfies. >+ if myparent: >+ myp = myparent.split() >+ if myp[3]=="merge": >+ self.mydbapi[myroot].cpv_inject(myp[2]) >+ if myp[0]=="binary": >+ self.pkgsettings.setinst(myp[2],portage.db["/"]["bintree"].dbapi) >+ else: >+ self.pkgsettings.setinst(myp[2],portage.db[myroot]["porttree"].dbapi) >+ >+ if not mymerge: >+ return 1 >+ > if "--debug" in myopts: > print "Candidates:",mymerge > for x in mymerge:
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 79509
: 49655