Merge lp:~talex5/ubuntu/precise/zeroinstall-injector/fix-for-953756 into lp:ubuntu/precise/zeroinstall-injector

[Thomas Leonard]

Fixes an incompatibility with the aptdaemon PackageKit implementation in precise.

[James Page (james-page)]

Hi Thomas

Thanks for taking the time to prepare this fix.

Some feedback:

1) debian/changelog.

You don't need to reference the full URL to the bug report: (LP: #953756) is sufficient and will trigger the bug to auto-close when the update is uploaded.

Also the version number should have a ubuntu suffix;

1.4.1-2 -> 1.4.1-1ubuntu1

2) debian/patches/packagekit-api.patch

The patch has some generated information in it still (this should be dropped); it would be great if this fix was forwarded upstream as well and the generated bug reference in a Forwarded: field as described in the generated information. Or if it came from upstream document this using appropriate fields.

I notice that Debian now has version 1.6 - would this resolve this bug? Might make more sense to re-sync if its not to invasive and upgrade.

Cheers

James

review: Needs Fixing

[Thomas Leonard (talex5)]

Thanks. 1.6 wouldn't fix it, although it would be good to sync anyway if possible as there's a certificate validation fix in there. If you sync it, I'll upload a new patch against 1.6.

The upstream fixes are:

http://repo.or.cz/w/zeroinstall.git/commitdiff/3f93170a7d12887c8795b4a0a6376b2482d2cfe3

http://repo.or.cz/w/zeroinstall.git/commitdiff/9b466b9b5fab731a9eaa565627cf3b2bea713153

[Daniel Holbach (dholbach)]

For the sync, please file a bug against the package with all necessary information about the update and subscribe the 'ubuntu-release' team to get an ACK of the release team.

[lp:~talex5/ubuntu/precise/zeroinstall-injector/fix-for-953756]

33. By Thomas Leonard on 2012-03-26

Fixed API incompatibility with PackageKit's InstallPackages (LP: #953756).

[Thomas Leonard (talex5)]

OK, I've pushed a new patch, against the new 1.6 package:

* The changelog is now in the correct format
* The version has an ubuntu suffix
* The patch has the auto-generated comments removed
* The patch references the upstream fix

There is a build of it in my PPA (except I had to change the version number to ubuntu2 there because I messed up the first upload and couldn't work out how to overwrite it):

https://launchpad.net/~talex5/+archive/0install/+packages

Thanks,

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me; with the only thing that you should run update-maintainer since this goes with Ubuntu changes. I've done so myself while merging this.

Upstream fix is reasonable and you're the upstream developer anyway, changes tested and verified to be working. I could match the other changes to the immediate next upstream commit in git.

Approved; I'll upload to the queue shortly (though it will wait there until post-freeze).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-12 15:19:54 +0000
+++ debian/changelog	2012-03-26 18:48:19 +0000
@@ -1,3 +1,9 @@
+zeroinstall-injector (1.6-1ubuntu1) precise; urgency=low
+
+  * Fixed API incompatibility with PackageKit's InstallPackages (LP: #953756).
+
+ -- Thomas Leonard <[e-mail]>  Fri, 16 Mar 2012 07:15:46 +0000
+
 zeroinstall-injector (1.6-1) unstable; urgency=low
 
   * New upstream release.

=== added directory 'debian/patches'
=== added file 'debian/patches/packagekit-api.patch'
--- debian/patches/packagekit-api.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/packagekit-api.patch	2012-03-26 18:48:19 +0000
@@ -0,0 +1,62 @@
+Description: Fixed API incompatibility with PackageKit's InstallPackages.
+ Ubuntu uses its own implementation of PackageKit, which behaves slightly
+ differently.
+Author: Thomas Leonard <[e-mail]>
+Origin: upstream, http://repo.or.cz/w/zeroinstall.git/commit/9b466b9b5fab731a9eaa565627cf3b2bea713153
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/zeroinstall-injector/+bug/953756
+Last-Update: 2012-03-26
+
+Index: zeroinstall-injector.dev/zeroinstall/injector/packagekit.py
+===================================================================
+--- zeroinstall-injector.dev.orig/zeroinstall/injector/packagekit.py	2012-03-26 17:05:10.902188000 +0100
++++ zeroinstall-injector.dev/zeroinstall/injector/packagekit.py	2012-03-26 17:05:39.420375222 +0100
+@@ -204,8 +204,8 @@
+ 			package_name = self.packagekit_id
+ 			self._transaction = _PackageKitTransaction(self.pk, installed_cb, error_cb)
+ 			self._transaction.compat_call([
+-					('InstallPackages', [package_name]),
+ 					('InstallPackages', False, [package_name]),
++					('InstallPackages', [package_name]),
+ 					])
+ 
+ 		_auth_wrapper(install_packages)
+@@ -289,8 +289,8 @@
+ 		defaultlocale = locale.getdefaultlocale()[0]
+ 		if defaultlocale is not None:
+ 			self.compat_call([
+-					('SetLocale', defaultlocale),
+ 					('SetHints', ['locale=%s' % defaultlocale]),
++					('SetLocale', defaultlocale),
+ 					])
+ 
+ 	def getPercentage(self):
+@@ -305,6 +305,8 @@
+ 		except:
+ 			return default
+ 
++	# note: Ubuntu's aptdaemon implementation of PackageKit crashes if passed the wrong
++	# arguments (rather than returning InvalidArgs), so always try its API first.
+ 	def compat_call(self, calls):
+ 		for call in calls:
+ 			method = call[0]
+@@ -313,8 +315,9 @@
+ 				dbus_method = self.proxy.get_dbus_method(method)
+ 				return dbus_method(*args)
+ 			except dbus.exceptions.DBusException as e:
+-				if e.get_dbus_name() != \
+-						'org.freedesktop.DBus.Error.UnknownMethod':
++				if e.get_dbus_name() not in (
++				   'org.freedesktop.DBus.Error.UnknownMethod',
++				   'org.freedesktop.DBus.Error.InvalidArgs'):
+ 					raise
+ 		raise Exception('Cannot call %r DBus method' % calls)
+ 
+@@ -340,7 +343,7 @@
+ 		package_name, version, arch, repo_ = id.split(';')
+ 		clean_version = distro.try_cleanup_distro_version(version)
+ 		if not clean_version:
+-			_logger_pk.warn(_("Can't parse distribution version '%(version)s' for package '%(package)s'"), {'version': version, 'package': package_name})
++			_logger_pk.info(_("Can't parse distribution version '%(version)s' for package '%(package)s'"), {'version': version, 'package': package_name})
+ 		clean_arch = distro.canonical_machine(arch)
+ 		package = {'version': clean_version,
+ 			   'name': package_name,

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-03-26 18:48:19 +0000
@@ -0,0 +1,1 @@
+packagekit-api.patch