Imported 2.564

No reason for CPC update specified.

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.

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)

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}