Merge ~ahasenack/ubuntu/+source/golang-github-fsouza-go-dockerclient:groovy-missing-bd-1883960 into ubuntu/+source/golang-github-fsouza-go-dockerclient:ubuntu/devel

Proposed by Andreas Hasenack
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 6fe546db329479adf1a3a61fcbe082b72db244a0
Merged at revision: 6fe546db329479adf1a3a61fcbe082b72db244a0
Proposed branch: ~ahasenack/ubuntu/+source/golang-github-fsouza-go-dockerclient:groovy-missing-bd-1883960
Merge into: ubuntu/+source/golang-github-fsouza-go-dockerclient:ubuntu/devel
Diff against target: 37 lines (+10/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+3/-1)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Michael Hudson-Doyle (community) Approve
Canonical Server MOTU reviewers Pending
Review via email: mp+385957@code.launchpad.net

Description of the change

Add a missing build dependency. The FTBFS doesn't happen in Debian, and I think the b-d comes via golang-github-docker-docker-dev which in the ubuntu case has shockingly just one depends, whereas in debian it has dozens. I filed bug #1883978 to investigate that.

Without this b-d, golang tries to fetch it at buildtime, and that fails in the launchpad builders.

I don't think it makes sense to push this to debian until bug #1883978 is further investigated. That being said, debian may have just gotten lucky, as the patch that introduced the requirement for this module in a previous upload (http://paste.ubuntu.com/p/23vMxTBWCV/) should have added the b-d.

The debian build logs (https://buildd.debian.org/status/fetch.php?pkg=golang-github-fsouza-go-dockerclient&arch=all&ver=1.6.5-1&stamp=1591875198&raw=0) show that golang-golang-x-crypto-dev was installed, so it's also not a case of the debian builders being generous with internet access during build.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/fsouza/

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

makes sense

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

* Changelog:
  - [√] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [ ] build is ok
  - [ ] verified PPA package installs/uninstalls
  - [ ] autopkgtest against the PPA package passes
  - [ ] sanity checks test fine

I didn't check build or autopkgtests since this is a FTBS already so if it doesn't build it'll be evident (and not a regression).

LGTM, +1

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, tagging and uploading 6fe546db329479adf1a3a61fcbe082b72db244a0

$ git push pkg upload/1.6.5-1ubuntu1
Enumerating objects: 17, done.
Counting objects: 100% (17/17), done.
Delta compression using up to 4 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 1.45 KiB | 1.45 MiB/s, done.
Total 13 (delta 9), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/golang-github-fsouza-go-dockerclient
 * [new tag] upload/1.6.5-1ubuntu1 -> upload/1.6.5-1ubuntu1

$ dput ubuntu ../golang-github-fsouza-go-dockerclient_1.6.5-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../golang-github-fsouza-go-dockerclient_1.6.5-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../golang-github-fsouza-go-dockerclient_1.6.5-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading golang-github-fsouza-go-dockerclient_1.6.5-1ubuntu1.dsc: done.
  Uploading golang-github-fsouza-go-dockerclient_1.6.5-1ubuntu1.debian.tar.xz: done.
  Uploading golang-github-fsouza-go-dockerclient_1.6.5-1ubuntu1_source.buildinfo: done.
  Uploading golang-github-fsouza-go-dockerclient_1.6.5-1ubuntu1_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 7fffbf7..3f6dae5 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+golang-github-fsouza-go-dockerclient (1.6.5-1ubuntu1) groovy; urgency=medium
7+
8+ * d/control: add missing golang-golang-x-crypto-dev build-dependency,
9+ needed for build-time tests (LP: #1883960)
10+
11+ -- Andreas Hasenack <andreas@canonical.com> Wed, 17 Jun 2020 18:24:47 -0300
12+
13 golang-github-fsouza-go-dockerclient (1.6.5-1) unstable; urgency=medium
14
15 [ Debian Janitor ]
16diff --git a/debian/control b/debian/control
17index 0d08a7b..58d8896 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -2,7 +2,8 @@ Source: golang-github-fsouza-go-dockerclient
21 Section: devel
22 Priority: optional
23 Standards-Version: 4.5.0
24-Maintainer: pkg-go <pkg-go-maintainers@lists.alioth.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: pkg-go <pkg-go-maintainers@lists.alioth.debian.org>
27 Uploaders: Dmitry Smirnov <onlyjob@debian.org>
28 Build-Depends: debhelper-compat (= 12),
29 dh-golang,
30@@ -15,6 +16,7 @@ Build-Depends: debhelper-compat (= 12),
31 # golang-github-opencontainers-runc-dev,
32 golang-github-sirupsen-logrus-dev,
33 golang-github-stretchr-testify-dev,
34+ golang-golang-x-crypto-dev,
35 golang-golang-x-net-dev,
36 golang-golang-x-sys-dev,
37 Homepage: https://github.com/fsouza/go-dockerclient

Subscribers

People subscribed via source and target branches