diff -u rhn-client-tools-1.8.26/debian/changelog rhn-client-tools-1.8.26/debian/changelog --- rhn-client-tools-1.8.26/debian/changelog +++ rhn-client-tools-1.8.26/debian/changelog @@ -1,3 +1,13 @@ +rhn-client-tools (1.8.26-4) unstable; urgency=medium + + * [e3525938] Fix installTime function for multiarch. + This should avoid to send None as timestamp via + xmlrpc, which resulted in a traceback due to changes in + xmlrpc, breaking spacewalk support. + Thanks to Klaas Demter and Philipp Born (Closes: #728365) + + -- Bernd Zeimetz Sat, 24 Jan 2015 09:39:24 +0100 + rhn-client-tools (1.8.26-3) unstable; urgency=medium * [11430f4f] Merge branch 'master' of only in patch2: unchanged: --- rhn-client-tools-1.8.26.orig/debian/patches/installTime_multiarch_fix +++ rhn-client-tools-1.8.26/debian/patches/installTime_multiarch_fix @@ -0,0 +1,32 @@ +--- a/src/up2date_client/debUtils.py ++++ b/src/up2date_client/debUtils.py +@@ -34,12 +34,14 @@ def parseVRE(version): + release = tmp[-1] + return version, release, epoch + +-def installTime(pkg_name): +- path = '/var/lib/dpkg/info/%s.list' % pkg_name +- if os.path.isfile(path): +- return os.path.getmtime(path) +- else: +- return None ++def installTime(pkg_name, arch=None): ++ paths = ['/var/lib/dpkg/info/%s.list' % (pkg_name,)] ++ if arch: ++ paths.append('/var/lib/dpkg/info/%s:%s.list' % (pkg_name, arch)) ++ for path in paths: ++ if os.path.isfile(path): ++ return os.path.getmtime(path) ++ return None + + #FIXME: Using Apt cache might not be an ultimate solution. + # It could be better to parse /var/lib/dpkg/status manually. +@@ -70,7 +72,7 @@ def getInstalledPackageList(msgCallback + 'version': version, + 'release': release, + 'arch': pkg.installed.architecture + '-deb', +- 'installtime': installTime(pkg.name) ++ 'installtime': installTime(pkg.name, pkg.installed.architecture) + } + pkg_list.append(package) + only in patch2: unchanged: --- rhn-client-tools-1.8.26.orig/debian/patches/series +++ rhn-client-tools-1.8.26/debian/patches/series @@ -0,0 +1 @@ +installTime_multiarch_fix