Merge ~raharper/cloud-init:ubuntu/devel/fix-90-dpkg-cfg into cloud-init:ubuntu/devel

[Ryan Harper]

debian/cloud-init.config get_yaml_list should return only the value

When fixing LP #1841697 we mistakenly added the key and list brackets
to the return value of the get_yaml_list function. This resulted in
cloud-init.postinst which creates 90_dpkg.cfg to duplicate the key
and brackets resulting in an invalid yaml file. This commit removes
the emitted $key and [ ] portions resulting in valid yaml when
cloud-init.postinst renders 90_dpkg.cfg.

LP: #1846511

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:bc88f2ca66d982de720a55b31c13335074a72ed6
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1202/
Executed test runs:
    FAILED: Checkout

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

review: Needs Fixing (continuous-integration)

[Dan Watkins (oddbloke)]

review: Approve

[Chad Smith (chad.smith)]

+1 validated both failure mode and fix. Also could test this fix directly applying and reverting this patch to /var/lib/dpkg/info/cloud-init.config and running dpkg-reconfigure --frontend=noninteractive cloud-init

[Chad Smith (chad.smith)]

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:bc88f2ca66d982de720a55b31c13335074a72ed6
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1203/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

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

review: Needs Fixing (continuous-integration)

[Dan Watkins (oddbloke)]

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:92242430b5e77a42228f9594311ea362f8c417c1
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1204/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

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

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:92242430b5e77a42228f9594311ea362f8c417c1
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1205/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

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

review: Needs Fixing (continuous-integration)

diff --git a/debian/changelog b/debian/changelog
index cfe1e0f..41e806b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cloud-init (19.2-36-g059d049c-0ubuntu3) eoan; urgency=medium
+
+  * debian/cloud-init.config get_yaml_list should return only the value
+    (LP: #1846511)
+
+ -- Ryan Harper <[e-mail]>  Wed, 09 Oct 2019 16:32:17 -0500
+
 cloud-init (19.2-36-g059d049c-0ubuntu2) eoan; urgency=medium
 
   * cherry-pick a7d8d032: get_interfaces: don't exclude bridge and bond
diff --git a/debian/cloud-init.config b/debian/cloud-init.config
index af38ffb..aacb1bf 100644
--- a/debian/cloud-init.config
+++ b/debian/cloud-init.config
@@ -37,9 +37,8 @@ get_yaml_list() {
 	[ -f "$file" ] || return 1
 	# strip all whitespace, delete lines not matching key:,
 	# strip key: and [] and replace ',' with ', '
-	LISTVAL="$(sed -e "s/\s//g" -e "/^$key:/"'!'d \
+	RET="$(sed -e "s/\s//g" -e "/^$key:/"'!'d \
 	           -e "s/$key:\[//" -e "s/]//" -e "s/,/, /g" "$file")"
-	RET="$key: [ ${LISTVAL} ]"
 	[ -n "$RET" ] || RET="$default"
 }