Merge ~rafaeldtinoco/ubuntu/+source/cloud-utils:lp1835124 into ubuntu/+source/cloud-utils:ubuntu/disco-devel

[Scott Moser]

[Scott Moser (smoser)]

review: Approve

[Scott Moser (smoser)]

I uploaded e9de3509560b0c952e6def92a9661c5cff57d505 which has version 0.31-0ubuntu1.2 to disco-proposed on 2019-06-06.

It is currently in the unapproved queue
 https://launchpad.net/ubuntu/disco/+queue?queue_state=1&queue_text=

 https://launchpadlibrarian.net/440570202/cloud-utils_0.31-0ubuntu1.2_source.changes

[Rafael David Tinoco (rafaeldtinoco)]

Verification:

https://bugs.launchpad.net/ubuntu/+source/cloud-utils/+bug/1810857/comments/12
https://bugs.launchpad.net/ubuntu/+source/cloud-utils/+bug/1835124/comments/23
https://bugs.launchpad.net/cloud-utils/+bug/1836593/comments/8

diff --git a/debian/changelog b/debian/changelog
index 80d02dd..d8b6868 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cloud-utils (0.31-0ubuntu1.2) disco; urgency=medium
+
+  * test-growpart: fix logic error resulting in test failure.
+    [Scott Moser] (LP: #1842682)
+
+ -- Rafael David Tinoco <[e-mail]>  Fri, 06 Sep 2019 10:47:23 -0300
+
 cloud-utils (0.31-0ubuntu1.1) disco; urgency=medium
 
   * fix race condition in test-growpart teardown seen on ppc64el (LP: #1836593)
diff --git a/debian/patches/lp1842682-test-growpart-fix-logic-error-resulting-test-failure.patch b/debian/patches/lp1842682-test-growpart-fix-logic-error-resulting-test-failure.patch
 new file mode 100644
index 0000000..6751703
--- /dev/null
+++ b/debian/patches/lp1842682-test-growpart-fix-logic-error-resulting-test-failure.patch
@@ -0,0 +1,32 @@
+From ef42f6b58505d9787f6583243ed7792b1a08d74b Mon Sep 17 00:00:00 2001
+From: Scott Moser <[e-mail]>
+Date: Wed, 4 Sep 2019 10:50:09 -0400
+Subject: [PATCH] test-growpart: fix logic error resulting in test failure.
+
+In test-growpart, the cleanup code should unmount if the tracking
+variable "MP" has a non-empty value, not an empty value.  An empty
+value would indicate that the mount has *not* been done.
+
+This is a regression caused by bug 1835124.
+
+LP: #1842682
+---
+ test/test-growpart | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-growpart b/test/test-growpart
+index 6df4b89..ecf2dd1 100755
+--- a/test/test-growpart
++++ b/test/test-growpart
+@@ -28,7 +28,7 @@ clearparts() {
+ 	udevadm settle
+ }
+ cleanup() {
+-	if [ -z "$MP" ]; then
++	if [ -n "$MP" ]; then
+ 		echo "unmount $MP";
+ 		umount "$MP";
+ 		udevadm settle
+-- 
+2.23.0
+
diff --git a/debian/patches/series b/debian/patches/series
index d6f2064..9feec79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 lp1810857-fix-spelling-error-in-ec2metadata-reservation-id.patch
 lp1835124-growpart-fix-bug-when-file-image-ends-in-a-digit.patch
 lp1836593-fix-race-condition-in-test-growpart.patch
+lp1842682-test-growpart-fix-logic-error-resulting-test-failure.patch