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

[entropy.spm] PortagePlugin: fix _usedeps_reduce

Browse Source
This commit is contained in:
Fabio Erculiani
2010-05-06 21:03:31 +02:00
parent 3233e4cb98
commit 7bca986e47
2 changed files with 69 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropy/spm/plugins/interfaces/portage_plugin/__init__.py
+68 -48
View File
@@ -3525,58 +3525,78 @@ class PortagePlugin(SpmPlugin):
myuse = myuse[:-1]
return myuse
for dependency in dependencies:
use_deps = entropy.tools.dep_getusedeps(dependency)
if use_deps:
new_use_deps = []
for use in use_deps:
"""
explicitly support only specific types
"""
if (use[0] == "!") and (use[-1] not in ("=", "?",)):
# this does not exist atm
def filter_use_deps(dependency):
new_use_deps = []
for use in use_deps:
"""
explicitly support only specific types
"""
if (use[0] == "!") and (use[-1] not in ("=", "?",)):
# this does not exist atm
continue
elif use[-1] == "=":
if use[0] == "!":
# foo[!bar=] means bar? ( foo[-bar] ) !bar? ( foo[bar] )
s_use = strip_use(use)
if s_use in enabled_useflags:
new_use_deps.append("-%s" % (s_use,))
else:
new_use_deps.append(s_use)
continue
elif use[-1] == "=":
if use[0] == "!":
# foo[!bar=] means bar? ( foo[-bar] ) !bar? ( foo[bar] )
s_use = strip_use(use)
if s_use in enabled_useflags:
new_use_deps.append("-%s" % (s_use,))
else:
new_use_deps.append(s_use)
continue
else:
# foo[bar=] means bar? ( foo[bar] ) !bar? ( foo[-bar] )
s_use = strip_use(use)
if s_use in enabled_useflags:
new_use_deps.append(s_use)
else:
# foo[bar=] means bar? ( foo[bar] ) !bar? ( foo[-bar] )
s_use = strip_use(use)
if s_use in enabled_useflags:
new_use_deps.append(s_use)
else:
new_use_deps.append("-%s" % (s_use,))
continue
elif use[-1] == "?":
if use[0] == "!":
# foo[!bar?] means bar? ( foo ) !bar? ( foo[-bar] )
s_use = strip_use(use)
if s_use not in enabled_useflags:
new_use_deps.append("-%s" % (s_use,))
continue
else:
# foo[bar?] means bar? ( foo[bar] ) !bar? ( foo )
s_use = strip_use(use)
if s_use in enabled_useflags:
new_use_deps.append(s_use)
continue
new_use_deps.append(use)
new_use_deps.append("-%s" % (s_use,))
continue
elif use[-1] == "?":
if use[0] == "!":
# foo[!bar?] means bar? ( foo ) !bar? ( foo[-bar] )
s_use = strip_use(use)
if s_use not in enabled_useflags:
new_use_deps.append("-%s" % (s_use,))
continue
else:
# foo[bar?] means bar? ( foo[bar] ) !bar? ( foo )
s_use = strip_use(use)
if s_use in enabled_useflags:
new_use_deps.append(s_use)
continue
new_use_deps.append(use)
return new_use_deps
if new_use_deps:
dependency = "%s[%s]" % (
entropy.tools.remove_usedeps(dependency),
','.join(new_use_deps),
)
else:
dependency = entropy.tools.remove_usedeps(dependency)
newlist.append(dependency)
for raw_dependency in dependencies:
split_deps = entropy.tools.dep_split_or_deps(depstring)
filtered_deps = []
for depstring in split_deps:
use_deps = entropy.tools.dep_getusedeps(depstring)
if use_deps:
new_use_deps = filter_use_deps(depstring)
if new_use_deps:
depstring = "%s[%s]" % (
entropy.tools.remove_usedeps(depstring),
','.join(new_use_deps),
)
else:
depstring = entropy.tools.remove_usedeps(depstring)
filtered_deps.append(depstring)
if len(filtered_deps) > 1:
or_dep = etpConst['entropyordepsep']
raw_dependency = or_dep.join(filtered_deps) + \
etpConst['entropyordepquestion']
else:
raw_dependency = filtered_deps[0]
newlist.append(raw_dependency)
return newlist
def _paren_reduce(self, mystr):
libraries/entropy/tools.py
+1 -1
View File
@@ -1924,7 +1924,7 @@ def dep_get_entropy_revision(mydep):
return myrev
return None
def dep_get_split_or_deps(mydep):
def dep_split_or_deps(mydep):
"""
docstring_title