Merge ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:eoan-apt-fix into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

Proposed by Andreas Hasenack on 2019-06-18
Status: Merged
Approved by: Andreas Hasenack on 2019-06-19
Approved revision: 898cb32b9b039352f97057eeedc4f23a731c467b
Merged at revision: 898cb32b9b039352f97057eeedc4f23a731c467b
Proposed branch: ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:eoan-apt-fix
Merge into: ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel
Diff against target: 27 lines (+8/-0)
2 files modified
apt-hook/hook.cc (+2/-0)
debian/changelog (+6/-0)
Reviewer Review Type Date Requested Status
Paride Legovini (community) 2019-06-18 Approve on 2019-06-19
Canonical Server Team 2019-06-19 Pending
Canonical Server Core Reviewers 2019-06-18 Pending
Review via email: mp+369008@code.launchpad.net

Commit message

apt-hook: Add missing headers for APT 1.9

APT 1.9 cleans up the APT headers ever so slightly, so we need to include a few more.

Description of the change

To post a comment you must log in.
Paride Legovini (legovini) wrote :

Looks good!

review: Approve
Andreas Hasenack (ahasenack) wrote :

Thanks Paride!

Andreas Hasenack (ahasenack) wrote :

Tagged and uploaded.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/apt-hook/hook.cc b/apt-hook/hook.cc
2index eb1583e..b5b3462 100644
3--- a/apt-hook/hook.cc
4+++ b/apt-hook/hook.cc
5@@ -19,6 +19,8 @@
6 #include <apt-pkg/cachefile.h>
7 #include <apt-pkg/error.h>
8 #include <apt-pkg/init.h>
9+#include <apt-pkg/pkgsystem.h>
10+#include <apt-pkg/policy.h>
11 #include <apt-pkg/strutl.h>
12
13 #include <fstream>
14diff --git a/debian/changelog b/debian/changelog
15index 2a97999..88d1f69 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,3 +1,9 @@
19+ubuntu-advantage-tools (19.4.1) eoan; urgency=medium
20+
21+ * apt-hook: Add missing headers for APT 1.9
22+
23+ -- Andreas Hasenack <andreas@canonical.com> Tue, 18 Jun 2019 18:21:19 -0300
24+
25 ubuntu-advantage-tools (19.4) disco; urgency=medium
26
27 * Drop the self-test assert in the apt-hook, it's making the subiquity

Subscribers

People subscribed via source and target branches