Merge lp:~townsend/unity8-preview-lxc/fix-lxc-image into lp:unity8-preview-lxc

[Christopher Townsend]

Instead of hardcoding 'wily' as the LXC image release, query the LXC download template database and parse the output to determine the latest image available.

[lp:~townsend/unity8-preview-lxc/fix-lxc-image]

80. By Christopher Townsend on 2015-10-27

Some more cleanup.

[Stephen M. Webb (bregma)]

Great.

review: Approve

=== modified file 'bin/unity8-lxc-setup'
--- bin/unity8-lxc-setup	2015-10-23 12:38:28 +0000
+++ bin/unity8-lxc-setup	2015-10-27 16:29:38 +0000
@@ -25,9 +25,7 @@
 import subprocess
 import sys
 import time
-import platform
 
-from distro_info import UbuntuDistroInfo, DistroDataOutdated
 
 CONTAINER_NAME = "unity8-lxc"
 SKIP_JOB = ["bluetooth", "lightdm", "plymouth", "plymouth-upstart-bridge",
@@ -58,11 +56,10 @@
 container_path = "%s/%s" % (lxc.default_config_path, CONTAINER_NAME)
 rootfs_path = "%s/rootfs" % container_path
 
-(distro, version, codename) = platform.linux_distribution()
-
 # Actions
 generate_rootfs = True
 
+
 def start_container(wait_for_network=True):
     if not container.running:
         print("Starting the container")
@@ -74,6 +71,24 @@
         print("Not able to connect to the network.")
         sys.exit(0)
 
+
+def get_latest_lxc_image(arch):
+    cmd = ['/usr/share/lxc/templates/lxc-download', '-d', 'ubuntu', '-a', arch, '-l']
+
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+    output = proc.communicate()[0]
+
+    lxc_output = output.split(b'\n')
+
+    for line in lxc_output:
+        if line.decode().startswith('ubuntu'):
+            last_line = line
+
+    release = last_line.decode().split('\t')
+
+    return release[1]
+
+
 # Destroy a container entirely
 if args.destroy and container.defined:
     container.stop()
@@ -110,13 +125,9 @@
 
     architecture = dpkg.stdout.read().strip()
 
-    try:
-        current_release = UbuntuDistroInfo().devel()
-    except DistroDataOutdated:
-        current_release = UbuntuDistroInfo().stable()
+    print("Determining latest LXC image release...")
+    current_release = get_latest_lxc_image(architecture)
 
-    # FIXME: Hard code wily for now since xenial lxc images have not been built yet.
-    current_release = 'wily'
     print("Creating the new unity8-lxc container...")
     container.create("download", 0,
                      {"dist": "ubuntu",

=== modified file 'debian/control'
--- debian/control	2015-10-22 13:54:12 +0000
+++ debian/control	2015-10-27 16:29:38 +0000
@@ -8,7 +8,7 @@
 
 Package: unity8-lxc
 Architecture: all
-Depends: python3, python3-lxc, sudo, python3-distro-info, ${misc:Depends}
+Depends: python3, python3-lxc, sudo, ${misc:Depends}
 Description: Unity8 LXC integration
  This package contains the scripts required to setup and run a Unity8
  desktop inside an LXC container.