Merge ~smoser/cloud-init:fix/1759307-add-depends-isc-dhcp-client into cloud-init:master

Proposed by Scott Moser on 2018-03-27
Status: Merged
Approved by: Scott Moser on 2018-03-27
Approved revision: 17706a3356efcbdfb7a1ee496f3626c0d9bec16b
Merge reported by: Scott Moser
Merged at revision: 5b9dc4bc6a02acb26d568ab4633661a621d83620
Proposed branch: ~smoser/cloud-init:fix/1759307-add-depends-isc-dhcp-client
Merge into: cloud-init:master
Diff against target: 14 lines (+2/-1)
1 file modified
packages/debian/control.in (+2/-1)
Reviewer Review Type Date Requested Status
Chad Smith Approve on 2018-03-27
Ryan Harper 2018-03-27 Approve on 2018-03-27
Review via email: mp+342215@code.launchpad.net

Commit message

Add missing dependency on isc-dhcp-client to trunk ubuntu packaging.

This just correctly adds the missing dependency on isc-dhcp-client.
That package is used via 'dhclient' from cloudinit/net/dhcp.py.

LP: #1759307

Description of the change

see commit message

To post a comment you must log in.
Ryan Harper (raharper) :
review: Approve
Scott Moser (smoser) wrote :

I did a quick build:

 $ ./packages/bddeb -d -S
Creating a temporary tarball using the 'make-tarball' helper
Extracting temporary tarball 'cloud-init_18.1-37-g17706a33.orig.tar.gz'
Creating a debian/ folder in '/tmp/tmpuyj7vfq6/cloud-init-18.1-37-g17706a33'
Running 'debuild -d -S -us -uc' in '/tmp/tmpuyj7vfq6/cloud-init-18.1-37-g17706a33'
Wrote 'cloud-init_18.1-37-g17706a33.orig.tar.gz'
Wrote 'cloud-init_18.1-37-g17706a33-1~bddeb_source.buildinfo'
Wrote 'cloud-init_18.1-37-g17706a33-1~bddeb_source.build'
Wrote 'cloud-init_18.1-37-g17706a33-1~bddeb_source.changes'
Wrote 'cloud-init_18.1-37-g17706a33-1~bddeb.dsc'
Linked 'cloud-init_18.1-37-g17706a33-1~bddeb.dsc' to 'cloud-init.dsc'
Wrote 'cloud-init_18.1-37-g17706a33-1~bddeb.debian.tar.xz'

Then an sbuild of that.

$ dpkg -I cloud-init_18.1-37-g17706a33-1~bddeb_all.deb
 new Debian package, version 2.0.
 size 337240 bytes: control archive=8720 bytes.
     920 bytes, 23 lines conffiles
     612 bytes, 12 lines control
   24727 bytes, 261 lines md5sums
    4130 bytes, 91 lines * postinst #!/bin/sh
     873 bytes, 21 lines * postrm #!/bin/sh
     560 bytes, 20 lines * preinst #!/bin/sh
     724 bytes, 17 lines * prerm #!/bin/sh
 Package: cloud-init
 Version: 18.1-37-g17706a33-1~bddeb
 Architecture: all
 Maintainer: Scott Moser <email address hidden>
 Installed-Size: 1651
 Depends: python3-configobj, python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-oauthlib, python3-requests, python3-six, python3-yaml, python3:any (>= 3.3.2-2~), isc-dhcp-client
 Recommends: eatmydata, sudo, software-properties-common, gdisk
 Section: admin
 Priority: optional
 Description: Init scripts for cloud instances
  Cloud instances need special scripts to run during initialisation
  to retrieve and install ssh keys and to let the user run various scripts.

Chad Smith (chad.smith) :
review: Approve
Chad Smith (chad.smith) wrote :

LGTM

review: Approve
Scott Moser (smoser) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=5b9dc4bc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/packages/debian/control.in b/packages/debian/control.in
2index 265b261..46da6df 100644
3--- a/packages/debian/control.in
4+++ b/packages/debian/control.in
5@@ -10,7 +10,8 @@ Standards-Version: 3.9.6
6 Package: cloud-init
7 Architecture: all
8 Depends: ${misc:Depends},
9- ${${python}:Depends}
10+ ${${python}:Depends},
11+ isc-dhcp-client
12 Recommends: eatmydata, sudo, software-properties-common, gdisk
13 XB-Python-Version: ${python:Versions}
14 Description: Init scripts for cloud instances

Subscribers

People subscribed via source and target branches