cloud-init

Merge ~oddbloke/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel

  1. Git
  2. lp:~oddbloke/cloud-init/+git/cloud-init
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Dan Watkins
Status: Merged
Merged at revision: 79991dc45b64ad9f16cb6f33987864a090b04372
Proposed branch: ~oddbloke/cloud-init/+git/cloud-init:ubuntu/devel
Merge into: cloud-init:ubuntu/devel
Diff against target: 38 lines (+10/-2)
2 files modified
debian/changelog (+8/-0)
tools/cloud-init-per (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Needs Fixing
Ryan Harper Approve
Review via email: mp+364192@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:c67a302117f0aaa96b25c243a858facc34485bd9
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/364192/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/631/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/631/rebuild

review: Needs Fixing (continuous-integration)

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 c17e38b..ac376ab 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+cloud-init (18.5-45-g3554ffe8-0ubuntu1) disco; urgency=medium
7+
8+ * New upstream snapshot.
9+ - cloud-init-per: POSIX sh does not support string subst, use sed
10+ (LP: #1819222)
11+
12+ -- Daniel Watkins <oddbloke@ubuntu.com> Fri, 08 Mar 2019 17:42:34 -0500
13+
14 cloud-init (18.5-44-g7c07af28-0ubuntu2) disco; urgency=medium
15
16 * d/postinst: remove now-incorrect apt pipelining configuration
17diff --git a/tools/cloud-init-per b/tools/cloud-init-per
18index eae3e93..fcd1ea7 100755
19--- a/tools/cloud-init-per
20+++ b/tools/cloud-init-per
21@@ -38,7 +38,7 @@ fi
22 [ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; }
23 [ $# -ge 3 ] || { Usage 1>&2; exit 1; }
24 freq=$1
25-name=${2/-/_}
26+name=$(echo $2 | sed 's/-/_/g')
27 shift 2;
28
29 [ "${name#*/}" = "${name}" ] || fail "name cannot contain a /"
30@@ -56,7 +56,7 @@ esac
31 # Rename legacy sem files with dashes in their names. Do not overwrite existing
32 # sem files to prevent clobbering those which may have been created from calls
33 # outside of cloud-init.
34-sem_legacy="${sem/_/-}"
35+sem_legacy=$(echo $sem | sed 's/_/-/g')
36 [ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"
37
38 [ "$freq" != "always" -a -e "$sem" ] && exit 0

Subscribers

People subscribed via source and target branches