rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/package.py | 6 +++---
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 15a71af93293cf0f9f2fba093dbbcccfdb238474
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 5 18:03:47 2013 +0100
Automatic commit of package [spacecmd] release [2.1.17-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 9c9f5df..537accd 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.16-1 spacecmd/
+2.1.17-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 22df27c..4ab38d8 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.16
+Version: 2.1.17
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Thu Dec 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.17-1
+- package search: make sure the lucene search syntax works
+
* Sun Dec 01 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.16-1
- 835979 - don't double convert start time 'now'
commit 4806644de1bd3a6ea94b18defcd513b7c0b71d2f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 5 18:00:51 2013 +0100
package search: make sure the lucene search syntax works
There's no need to use 're' here, simple substring search here suffices;
also, re would not match in case the search string contains parantheses.
diff --git a/spacecmd/src/lib/package.py b/spacecmd/src/lib/package.py
index e41608b..ea2f355 100644
--- a/spacecmd/src/lib/package.py
+++ b/spacecmd/src/lib/package.py
@@ -103,14 +103,14 @@ def do_package_search(self, args, doreturn = False):
self.help_package_search()
return
- fields = ('name', 'epoch', 'version', 'release',
- 'arch', 'description', 'summary')
+ fields = ('name:', 'epoch:', 'version:', 'release:',
+ 'arch:', 'description:', 'summary:')
packages = []
advanced = False
for f in fields:
- if re.match('%s:' % f, args):
+ if args.find(f) != -1:
logging.debug('Using advanced search')
advanced = True
break
Show replies by date