diff --git a/rhn-client-tools.spec b/rhn-client-tools.spec index 67e77d5f57..c556226307 100644 --- a/rhn-client-tools.spec +++ b/rhn-client-tools.spec @@ -5,7 +5,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar. URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools Version: 2.0.2 -Release: 15%{?dist} +Release: 16%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if 0%{?suse_version} @@ -361,6 +361,11 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Thu Jun 29 2017 Gennadii Altukhov 2.0.2-16 +- Resolves: #1415742 - rhn-search traceback - immediateTrigger-server exists + with certain identification1415742 - rhn-search traceback - immediateTrigger- + server exists with certain identification (eherget@redhat.com) + * Thu Jun 29 2017 Gennadii Altukhov 2.0.2-15 - Related: #1378903 - fix keywords in a changelog1378903 - fix keywords in a changelog (galt@redhat.com) diff --git a/src/up2date_client/up2dateUtils.py b/src/up2date_client/up2dateUtils.py index 1c9f40dbf0..0147610412 100644 --- a/src/up2date_client/up2dateUtils.py +++ b/src/up2date_client/up2dateUtils.py @@ -12,6 +12,11 @@ import up2dateErrors import config import gettext from pkgplatform import getPlatform +from up2date_client import up2dateErrors +from up2date_client import config +from up2date_client.pkgplatform import getPlatform +from rhn.i18n import sstr + t = gettext.translation('rhn-client-tools', fallback=True) _ = t.ugettext @@ -32,17 +37,17 @@ else: ts = transaction.initReadOnlyTransaction() for h in ts.dbMatch('Providename', "redhat-release"): SYSRELVER = 'system-release(releasever)' - version = h['version'] - release = h['release'] + version = sstr(h['version']) + release = sstr(h['release']) if SYSRELVER in h['providename']: provides = dict(zip(h['providename'], h['provideversion'])) release = '%s-%s' % (version, release) version = provides[SYSRELVER] - osVersionRelease = (h['name'], version, release) + osVersionRelease = (sstr(h['name']), version, release) return osVersionRelease else: for h in ts.dbMatch('Providename', "distribution-release"): - osVersionRelease = (h['name'], h['version'], h['release']) + osVersionRelease = (sstr(h['name']), sstr(h['version']), sstr(h['release'])) # zypper requires a exclusive lock on the rpmdb. So we need # to close it here. ts.ts.closeDB()