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

Proposed by Justin McPherson on 2014-12-02
Status: Needs review
Proposed branch: lp:~justinmcp/aptdaemon/1352654
Merge into: lp:aptdaemon
Diff against target: 34 lines (+2/-4)
2 files modified
aptdaemon/pkcompat.py (+1/-3)
aptdaemon/worker/aptworker.py (+1/-1)
To merge this branch: bzr merge lp:~justinmcp/aptdaemon/1352654
Reviewer Review Type Date Requested Status
Robert Ancell (community) Approve on 2015-09-28
Iain Lane (community) Approve on 2015-09-28
Aptdaemon Developers 2014-12-02 Pending
Review via email: mp+243354@code.launchpad.net

Commit message

 #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.

To post a comment you must log in.
lp:~justinmcp/aptdaemon/1352654 updated on 2015-04-13
985. By Justin McPherson <justin@phablet-dev> on 2015-04-13

Merge from trunk.

Robert Ancell (robert-ancell) wrote :

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) wrote :

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

Iain Lane (laney) wrote :

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) wrote :

Changing to approved as Laney says the changes are necessary.

review: Approve
Sebastien Bacher (seb128) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'aptdaemon/pkcompat.py'
2--- aptdaemon/pkcompat.py 2014-06-26 07:07:15 +0000
3+++ aptdaemon/pkcompat.py 2015-04-13 01:43:02 +0000
4@@ -391,7 +391,7 @@
5 distro, version, _codename = platform.dist()
6 self._distro_id = "%s;%s;%s" % (distro or "unknown",
7 version or "unknown",
8- NATIVE_ARCH)
9+ self.queue.worker.NATIVE_ARCH)
10 return self._distro_id
11
12 def _on_network_state_changed(self, mon, state):
13@@ -1900,8 +1900,6 @@
14 id += ":%s" % arch
15 if version:
16 id += "=%s" % version
17- if data and data not in ["local", "installed"]:
18- id += "/%s" % data
19 return id
20
21 def _get_merged_trans(self, role, pkg_ids=None, pkg_type=None,
22
23=== modified file 'aptdaemon/worker/aptworker.py'
24--- aptdaemon/worker/aptworker.py 2014-06-26 07:13:49 +0000
25+++ aptdaemon/worker/aptworker.py 2015-04-13 01:43:02 +0000
26@@ -1482,7 +1482,7 @@
27 key = "APT::Periodic::AutocleanInterval"
28 return apt_pkg.config.find_i(key, 0)
29 elif option == "UnattendedUpgrade":
30- key = "APT::Periodic::Unattended-Upgrade",
31+ key = "APT::Periodic::Unattended-Upgrade"
32 return apt_pkg.config.find_b(key, False)
33 elif option == "GetPopconParticipation":
34 return self._get_popcon_pariticipation()

Subscribers

People subscribed via source and target branches

to status/vote changes: