* fix: search: intersection of individual result sets, not union
* fix: build: check build dependency version, fail if cannot be satisfied
This commit is contained in:
+5
-1
@@ -378,9 +378,13 @@ class Builder:
|
||||
dep_unsatis.append(dep)
|
||||
|
||||
if dep_unsatis:
|
||||
ctx.ui.info(_("Unsatisfied Build Dependencies:"))
|
||||
ctx.ui.info(_("Unsatisfied Build Dependencies:") + ' '
|
||||
+ util.strlist([str(x) for x in dep_unsatis]) )
|
||||
for dep in dep_unsatis:
|
||||
if not dependency.repo_satisfies_dep(dep):
|
||||
raise Error(_('Build dependency %s cannot be satisfied') % str(dep))
|
||||
ctx.ui.warning(str(dep))
|
||||
|
||||
if not ctx.config.get_option('ignore_dependency'):
|
||||
if ctx.ui.confirm(
|
||||
_('Do you want to install the unsatisfied build dependencies')):
|
||||
|
||||
@@ -39,7 +39,7 @@ class InvertedIndex(object):
|
||||
def query(self, terms, txn = None):
|
||||
def proc(txn):
|
||||
docs = [ self.get_term(x, txn) for x in terms ]
|
||||
return reduce(lambda x,y: x.union(y), docs)
|
||||
return reduce(lambda x,y: x.intersection(y), docs)
|
||||
return self.d.txn_proc(proc, txn)
|
||||
|
||||
def list_terms(self, txn= None):
|
||||
|
||||
Reference in New Issue
Block a user