Hello community, here is the log from the commit of package scout for openSUSE:Factory checked in at 2014-04-12 21:29:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scout (Old) and /work/SRC/openSUSE:Factory/.scout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scout" Changes: -------- --- /work/SRC/openSUSE:Factory/scout/scout.changes 2014-03-04 14:02:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scout.new/scout.changes 2014-04-12 22:11:57.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 10 14:50:12 CEST 2014 - [email protected] + +- adapt to Dataiterator changes in libsolv-0.6.0 + +------------------------------------------------------------------- Old: ---- scout-g32312797.tar.bz2 New: ---- scout-g562bbee6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scout.spec ++++++ --- /var/tmp/diff_new_pack.hXAWQC/_old 2014-04-12 22:15:07.000000000 +0200 +++ /var/tmp/diff_new_pack.hXAWQC/_new 2014-04-12 22:15:07.000000000 +0200 @@ -23,7 +23,7 @@ Summary: Indexing Package Properties License: MIT Group: System/Packages -Source: %{name}-g32312797.tar.bz2 +Source: %{name}-g562bbee6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext BuildRequires: python @@ -40,7 +40,7 @@ %endif %if 0%{?suse_version} > 1100 BuildRequires: python-solv -Requires: python-solv +Requires: python-solv >= 0.6.0 %endif %else BuildArch: noarch ++++++ scout-g32312797.tar.bz2 -> scout-g562bbee6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scout/scout/bin.py new/scout/scout/bin.py --- old/scout/scout/bin.py 2014-03-03 14:55:32.000000000 +0100 +++ new/scout/scout/bin.py 2014-04-10 14:48:58.000000000 +0200 @@ -38,19 +38,18 @@ pkgmatch = [] if not inversesearch: pathreprg = re.compile(self.pathre + re.escape(term) + '$') - # work around missing stringification code in libsolv bindings - for d in self.pool.Dataiterator(0, solv.SOLVABLE_FILELIST, "/" + term, solv.Dataiterator.SEARCH_STRINGEND | solv.Dataiterator.SEARCH_FILES): - for d2 in self.pool.Dataiterator(d.solvid, solv.SOLVABLE_FILELIST, None, solv.Dataiterator.SEARCH_FILES): - path = str(d2) - # do matching for path - if not pathreprg.match(path): continue - row = ( 'zypp (%s)' % d.solvable.repo.name.decode('utf-8'), d.solvable.name.decode('utf-8'), path[:-len(term)-1], term ) - if not row in pkgmatch: - pkgmatch.append( row ) + # SEARCH_STRING without SEARCH_FILES matches basenames + for d in self.pool.Dataiterator(solv.SOLVABLE_FILELIST, term, solv.Dataiterator.SEARCH_STRING): + path = str(d) + # do matching for path + if not pathreprg.match(path): continue + row = ( 'zypp (%s)' % d.solvable.repo.name.decode('utf-8'), d.solvable.name.decode('utf-8'), path[:-len(term)-1], term ) + if not row in pkgmatch: + pkgmatch.append( row ) else: pathreprg = re.compile(self.pathre + '[^/]+$') - for d in self.pool.Dataiterator(0, solv.SOLVABLE_NAME, term, solv.Dataiterator.SEARCH_STRING): - for d2 in self.pool.Dataiterator(d.solvid, solv.SOLVABLE_FILELIST, None, solv.Dataiterator.SEARCH_FILES): + for d in self.pool.Dataiterator(solv.SOLVABLE_NAME, term, solv.Dataiterator.SEARCH_STRING): + for d2 in self.pool.Dataiterator_solvid(d.solvid, solv.SOLVABLE_FILELIST): path = str(d2) if not pathreprg.match(path): continue binary = os.path.basename(path) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
