Merge lp:~ubuntu-branches/ubuntu/precise/zeroinstall-injector/precise-201203280703 into lp:ubuntu/precise/zeroinstall-injector

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/zeroinstall-injector reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/zeroinstall-injector/precise-201203280703. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

33. By Mathieu Trudel-Lapierre on 2012-03-28

releasing version 1.6-1ubuntu1

=== added directory 'debian/patches'
=== renamed directory 'debian/patches' => 'debian/patches.moved'
=== 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-28 07:09: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-28 07:09:19 +0000
@@ -0,0 +1,1 @@
+packagekit-api.patch