diff -Nru byov-2.1.0/byov/vms/lxd.py byov-2.1.0/byov/vms/lxd.py --- byov-2.1.0/byov/vms/lxd.py 2018-06-07 17:33:23.000000000 +0000 +++ byov-2.1.0/byov/vms/lxd.py 2018-06-30 12:10:10.000000000 +0000 @@ -88,7 +88,7 @@ try: _, source, err = subprocesses.run(info_command) except errors.CommandError as e: - if e.err == 'error: not found\n': + if e.err.lower() == 'error: not found\n': return info else: raise diff -Nru byov-2.1.0/debian/bzr-builder.manifest byov-2.1.0/debian/bzr-builder.manifest --- byov-2.1.0/debian/bzr-builder.manifest 2018-06-07 17:33:23.000000000 +0000 +++ byov-2.1.0/debian/bzr-builder.manifest 2018-06-30 12:10:10.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~367 -lp:byov revid:v.ladeuil+lp@free.fr-20180607172958-145iswsgrv2wzo0m +# bzr-builder format 0.3 deb-version {debupstream}-0~370 +lp:byov revid:v.ladeuil+lp@free.fr-20180630115528-icqowsikr6g1ukyf diff -Nru byov-2.1.0/debian/changelog byov-2.1.0/debian/changelog --- byov-2.1.0/debian/changelog 2018-06-07 17:33:23.000000000 +0000 +++ byov-2.1.0/debian/changelog 2018-06-30 12:10:10.000000000 +0000 @@ -1,8 +1,8 @@ -byov (2.1.0-0~367~ubuntu17.10.1) artful; urgency=low +byov (2.1.0-0~370~ubuntu17.10.1) artful; urgency=low * Auto build. - -- Vincent Ladeuil Thu, 07 Jun 2018 17:33:23 +0000 + -- Vincent Ladeuil Sat, 30 Jun 2018 12:10:10 +0000 byov (2.1.0) unstable; urgency=medium diff -Nru byov-2.1.0/NEWS.rst byov-2.1.0/NEWS.rst --- byov-2.1.0/NEWS.rst 2018-06-07 17:33:23.000000000 +0000 +++ byov-2.1.0/NEWS.rst 2018-06-30 12:10:10.000000000 +0000 @@ -10,6 +10,9 @@ * Add support for bionic to scripts/bootstrap-scaleway-image and unminimize the resulting image. + * Fix lxd > 3.0 compatibility: lxc info error message spelling has + changed. + 2.1.0 ===== diff -Nru byov-2.1.0/scripts/transform-scaleway-image byov-2.1.0/scripts/transform-scaleway-image --- byov-2.1.0/scripts/transform-scaleway-image 2018-06-07 17:33:23.000000000 +0000 +++ byov-2.1.0/scripts/transform-scaleway-image 2018-06-30 12:10:10.000000000 +0000 @@ -12,8 +12,8 @@ # image. This is mainly installing and configuring cloud-init. # Cleanup -APT_OPTIONS=$(echo {apt.options} | sed -e 's/,/ /g') -apt-get $APT_OPTIONS autoremove +APT_COMMAND=$(echo {apt.command} | sed -e 's/,/ /g') +$APT_COMMAND autoremove # At this point we have cloud-init >= 17.1 with scaleway userdata support. @@ -56,7 +56,7 @@ chmod 644 /etc/apt/sources.list # FIXME: This should be 'apt.update.command' with proper retries. # -- vila 2018-06-05 -apt-get $APT_OPTIONS update +$APT_COMMAND update # Disable unattended upgrades at they cause a race with cloud-init/byov diff -Nru byov-2.1.0/TODO.rst byov-2.1.0/TODO.rst --- byov-2.1.0/TODO.rst 2018-06-07 17:33:23.000000000 +0000 +++ byov-2.1.0/TODO.rst 2018-06-30 12:10:10.000000000 +0000 @@ -1,3 +1,5 @@ +* IWBNI byovm list could list the known vms and show their status, IP, etc. + * Have a look at the various '@' uses and settle on a consistent one. * WIBNI save_existing_config kept tracked of /used/ config options as the