Add python3 vmdkstream support

debian/changelog

@@ -1,6 +1,7 @@
 livecd-rootfs (2.562) UNRELEASED; urgency=medium
 
   * subiquity: make subiqutiy_config.mount optional
+  * Add python3 vmdkstream support
 
  -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 18 Feb 2019 10:26:53 +0100
 

debian/control

@@ -28,6 +28,7 @@ Depends: ${misc:Depends},
          parted,
          procps,
          python-minimal | python,
+         python3-minimal | python3,
          python3-apt,
          python3-software-properties,
          qemu-utils,
@@ -37,7 +38,7 @@ Depends: ${misc:Depends},
          sudo,
          u-boot-tools [armhf arm64],
          ubuntu-image,
-         vmdk-stream-converter [amd64 i386],
+         python3-vmdkstream [amd64 i386] | vmdk-stream-converter [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
-    python -m ${streamconverter} ${scratch_d}/resize.img ${destination}
+    python3 -m ${streamconverter} ${scratch_d}/resize.img ${destination} || python2 -m ${streamconverter} ${scratch_d}/resize.img ${destination}
     modify_vmdk_header ${destination}
 
     qemu-img info ${destination}