From 34188f3f6b48f21cf492ed47661701f56c4fde21 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Tue, 19 Feb 2019 11:26:06 +0000
Subject: [PATCH] Imported 2.564

No reason for CPC update specified.
---
 debian/changelog     | 6 ++++++
 debian/control       | 2 +-
 live-build/functions | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2cfdf671..363f6af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.564) disco; urgency=medium
+
+  * Use python3 vmdkstream exclusively; we should not fall back to python2.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 19 Feb 2019 08:28:43 +0100
+
 livecd-rootfs (2.563) disco; urgency=medium
 
   * Make sure buildd images have a /usr/sbin/policy-rc.d symlink.
diff --git a/debian/control b/debian/control
index 5d2c9049..9dd5287f 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends: ${misc:Depends},
          sudo,
          u-boot-tools [armhf arm64],
          ubuntu-image,
-         python3-vmdkstream [amd64 i386] | vmdk-stream-converter [amd64 i386],
+         python3-vmdkstream [amd64 i386],
          xz-utils,
          zerofree
 Breaks: ubuntu-defaults-builder (<< 0.32)
diff --git a/live-build/functions b/live-build/functions
index 31a5ab8f..c0dfcdca 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -271,7 +271,7 @@ create_vmdk() {
     cp ${src} ${scratch_d}/resize.img
 
     truncate --size=${size}M ${scratch_d}/resize.img
-    python3 -m ${streamconverter} ${scratch_d}/resize.img ${destination} || python2 -m ${streamconverter} ${scratch_d}/resize.img ${destination}
+    python3 -m ${streamconverter} ${scratch_d}/resize.img ${destination}
     modify_vmdk_header ${destination}
 
     qemu-img info ${destination}