diff options
| author | Jason Stubbs <jstubbs@gentoo.org> | 2005-09-29 16:29:15 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-09-29 16:29:15 +0000 |
| commit | 69ee9b83dfa4d80c42d58bfd07ef4a2020081816 (patch) | |
| tree | dc0ce001c1759ab50040ca579cfbc40d1b68bafb | |
| parent | d8f51019dd634453288540675f0148d15ae4735d (diff) | |
| download | portage-69ee9b83dfa4d80c42d58bfd07ef4a2020081816.tar.gz portage-69ee9b83dfa4d80c42d58bfd07ef4a2020081816.tar.bz2 portage-69ee9b83dfa4d80c42d58bfd07ef4a2020081816.zip | |
remove CDEPEND
ignore RDEPEND on --buildpkgonly
svn path=/main/branches/2.0/; revision=2046
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 8f0971aa4..8f4edc755 100755 --- a/bin/emerge +++ b/bin/emerge @@ -985,7 +985,6 @@ class depgraph: edepend["DEPEND"] ="" edepend["RDEPEND"]=string.join(string.split(edepend["RDEPEND"])," ") edepend["PDEPEND"]=string.join(string.split(edepend["PDEPEND"])," ") - edepend["CDEPEND"]=string.join(string.split(edepend["CDEPEND"])," ") edepend["SLOT"] =string.strip(edepend["SLOT"]) #portage.db[portage.root]["bintree"].gettbz2(mykey) else: # It's local. @@ -993,14 +992,16 @@ class depgraph: edepend["DEPEND"] ="" edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ") edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ") - edepend["CDEPEND"]=string.join(mytbz2.getelements("CDEPEND")," ") edepend["SLOT"] =mytbz2.getfile("SLOT",mypkgparts[2]) elif mytype=="ebuild": try: - mymeta = ["DEPEND","RDEPEND","PDEPEND","CDEPEND"] + mymeta = ["DEPEND","RDEPEND","PDEPEND"] myfoo = portage.portdb.aux_get(mykey, mymeta) for index in range(0,len(mymeta)): edepend[mymeta[index]] = myfoo[index] + if "--buildpkgonly" in myopts: + edepend["RDEPEND"] = "" + edepend["PDEPEND"] = "" except (KeyError,IOError): print "emerge: create(): aux_get() error on",mykey+"; aborting..." sys.exit(1) |