Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix: search: intersection of individual result sets, not union

Browse Source 
* fix: build: check build dependency version, fail if cannot be  
  satisfied
This commit is contained in:
Eray Özkural
2005-12-12 13:31:31 +00:00
parent f407023285
commit ee9f28be9a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+5 -1
View File
@@ -378,9 +378,13 @@ class Builder:
dep_unsatis.append(dep) dep_unsatis.append(dep)
if dep_unsatis: 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: 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)) ctx.ui.warning(str(dep))
if not ctx.config.get_option('ignore_dependency'): if not ctx.config.get_option('ignore_dependency'):
if ctx.ui.confirm( if ctx.ui.confirm(
_('Do you want to install the unsatisfied build dependencies')): _('Do you want to install the unsatisfied build dependencies')):
pisi/search/invertedindex.py
+1 -1
View File
@@ -39,7 +39,7 @@ class InvertedIndex(object):
def query(self, terms, txn = None): def query(self, terms, txn = None):
def proc(txn): def proc(txn):
docs = [ self.get_term(x, txn) for x in terms ] 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) return self.d.txn_proc(proc, txn)
def list_terms(self, txn= None): def list_terms(self, txn= None):