Merge lp:~justinmcp/aptdaemon/1352654 into lp:aptdaemon

[Justin McPherson]

 #1352654 No longer able to install packages with PackageKit

  Revert attempt to add archive information, (was adding Origin).

  The correct information for the apt package specification is not available at
  this point in the code. Revert to an earlier version that more correctly
  specifies package.

[lp:~justinmcp/aptdaemon/1352654]

985. By Justin McPherson <justin@phablet-dev> on 2015-04-13

Merge from trunk.

[Robert Ancell (robert-ancell)]

This merge has a number of unrelated changes but merging revision 984 fixes the problem for me in wily.

review: Needs Fixing

[Iain Lane (laney)]

The other changes are necessary. I'll review/upload.

[Iain Lane (laney)]

Sorry I forgot until seb pinged me. :(

The "data" field, per the documentation, is "For a remote, not-installed package the data field should be set as the repository identifier or repository name." - that means that we shouldn't use it after a "/" to be passed to apt. That specifies a release.

The other fixes are syntax and crash fixes. Thanks! Really uploading now! Could someone merge this?

review: Approve

[Robert Ancell (robert-ancell)]

Changing to approved as Laney says the changes are necessary.

review: Approve

[Sebastien Bacher (seb128)]

the changes have been uploaded to wily

Unmerged revisions

985. By Justin McPherson <justin@phablet-dev> on 2015-04-13

Merge from trunk.

984. By Justin McPherson <justin@phablet-dev> on 2014-12-02

#1352654 No longer able to install packages with PackageKit

Revert attempt to add archive information, (was adding Origin).

The correct information for the apt package specification is not available at
this point in the code. Revert to an earlier version that more correctly
specifies package.

983. By Justin McPherson <justin@phablet-dev> on 2014-12-02

Remove trailing comma.

Was causing a TypeError.

982. By Justin McPherson <justin@phablet-dev> on 2014-12-02

Fix resolution of constant.

=== modified file 'aptdaemon/pkcompat.py'
--- aptdaemon/pkcompat.py	2014-06-26 07:07:15 +0000
+++ aptdaemon/pkcompat.py	2015-04-13 01:43:02 +0000
@@ -391,7 +391,7 @@
             distro, version, _codename = platform.dist()
             self._distro_id = "%s;%s;%s" % (distro or "unknown",
                                             version or "unknown",
-                                            NATIVE_ARCH)
+                                            self.queue.worker.NATIVE_ARCH)
         return self._distro_id
 
     def _on_network_state_changed(self, mon, state):
@@ -1900,8 +1900,6 @@
             id += ":%s" % arch
         if version:
             id += "=%s" % version
-        if data and data not in ["local", "installed"]:
-            id += "/%s" % data
         return id
 
     def _get_merged_trans(self, role, pkg_ids=None, pkg_type=None,

=== modified file 'aptdaemon/worker/aptworker.py'
--- aptdaemon/worker/aptworker.py	2014-06-26 07:13:49 +0000
+++ aptdaemon/worker/aptworker.py	2015-04-13 01:43:02 +0000
@@ -1482,7 +1482,7 @@
             key = "APT::Periodic::AutocleanInterval"
             return apt_pkg.config.find_i(key, 0)
         elif option == "UnattendedUpgrade":
-            key = "APT::Periodic::Unattended-Upgrade",
+            key = "APT::Periodic::Unattended-Upgrade"
             return apt_pkg.config.find_b(key, False)
         elif option == "GetPopconParticipation":
             return self._get_popcon_pariticipation()