launchpad-buildd

Merge ~cjwatson/launchpad-buildd:fix-version-checks into launchpad-buildd:master

  1. Git
  2. lp:~cjwatson/launchpad-buildd
  3. fix-version-checks
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 1771e409d96e7a20058f4998f5222a341e1db040
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad-buildd:fix-version-checks
Merge into: launchpad-buildd:master
Diff against target: 52 lines (+9/-2)
4 files modified
.gitignore (+1/-0)
bin/builder-prep (+1/-1)
debian/changelog (+6/-0)
lpbuildd/builder.py (+1/-1)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+389595@code.launchpad.net

Commit message

Fix version checks for deployments using Python 3

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index b47264e..66b9784 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -7,6 +7,7 @@ debian/debhelper-build-stamp
6 debian/files
7 debian/launchpad-buildd
8 debian/python-lpbuildd
9+debian/python3-lpbuildd
10 debian/tmp
11 debian/*.debhelper.log
12 debian/*.debhelper
13diff --git a/bin/builder-prep b/bin/builder-prep
14index cb8ff90..0a75e9a 100755
15--- a/bin/builder-prep
16+++ b/bin/builder-prep
17@@ -9,7 +9,7 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin:${PATH}
18
19 NTPDATE=ntpdate
20 SUDO=sudo
21-PACKAGES="launchpad-buildd python-lpbuildd sbuild bzr-builder bzr git-build-recipe git dpkg-dev python-debian"
22+PACKAGES="launchpad-buildd python-lpbuildd python3-lpbuildd sbuild bzr-builder bzr git-build-recipe git dpkg-dev python-debian python3-debian"
23 KERNEL=$(uname -snrvm)
24
25 echo "Kernel version: $KERNEL"
26diff --git a/debian/changelog b/debian/changelog
27index f998389..70d64cf 100644
28--- a/debian/changelog
29+++ b/debian/changelog
30@@ -1,3 +1,9 @@
31+launchpad-buildd (191) UNRELEASED; urgency=medium
32+
33+ * Fix version checks for deployments using Python 3.
34+
35+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 20 Aug 2020 12:21:28 +0100
36+
37 launchpad-buildd (190) bionic; urgency=medium
38
39 [ Colin Watson ]
40diff --git a/lpbuildd/builder.py b/lpbuildd/builder.py
41index ee3364b..4c4135a 100644
42--- a/lpbuildd/builder.py
43+++ b/lpbuildd/builder.py
44@@ -705,7 +705,7 @@ class XMLRPCBuilder(xmlrpc.XMLRPC):
45 self._managers = {}
46 cache = apt.Cache()
47 try:
48- installed = cache["python-lpbuildd"].installed
49+ installed = cache["launchpad-buildd"].installed
50 self._version = installed.version if installed else None
51 except KeyError:
52 self._version = None

Subscribers

People subscribed via source and target branches