sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

another whoops fixed

Browse Source 
git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1106 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
(no author)
2008-01-28 10:47:47 +00:00
parent 1202768c75
commit 2b45d9efd3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropyTools.py
+2 -2
View File
@@ -2069,8 +2069,8 @@ def extractPkgData(package, etpBranch = etpConst['branch'], silent = False, inje
else:
data['useflags'].append("-"+x)
data['sources'] = portage_metadata['SRC_URI'].split()
data['dependencies'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if not x.startswith("!")]
data['conflicts'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if x.startswith("!")]
data['dependencies'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if not x.startswith("!") and if not x in ("(","||",")","")]
data['conflicts'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if x.startswith("!") and if not x in ("(","||",")","")]
if (kernelDependentModule):
# add kname to the dependency
libraries/portageTools.py
+1
View File
@@ -345,6 +345,7 @@ def calculate_dependencies(my_iuse, my_use, my_license, my_depend, my_rdepend, m
use = [f for f in use if f in iuse]
use.sort()
metadata['USE'] = " ".join(use)
# FIXME: there's some portage trunk stuff
try:
from portage_dep import paren_reduce, use_reduce, paren_enclose
p_normalize = paren_normalize