Ubuntu Pastebin

Paste from sergiusens at Wed, 17 Jun 2015 19:18:53 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2015-06-01 08:55:38 +0000
+++ lib/cdimage/livefs.py	2015-06-17 19:15:15 +0000
@@ -629,7 +629,7 @@
     if item in (
         "cloop", "squashfs", "manifest", "manifest-desktop", "manifest-remove",
         "size", "ext2", "ext3", "ext4", "rootfs.tar.gz", "custom.tar.gz",
-        "device.tar.gz", "tar.xz", "iso",
+        "device.tar.gz", "azure.device.tar.gz", "tar.xz", "iso",
     ):
         if project == "tocd3":
             # auto-purged - reverting to plan B
@@ -957,6 +957,9 @@
         for arch in config.arches:
             download_live_items(config, arch, "device.tar.gz")
 
+    if config.project in ("ubuntu-core", ):
+            download_live_items(config, arch, "azure.device.tar.gz")
+
     if (project == "edubuntu" and config["CDIMAGE_INSTALL"] and
             series <= "hardy"):
         for cpuarch in config.cpuarches:

=== modified file 'lib/cdimage/tests/test_livefs.py'
--- lib/cdimage/tests/test_livefs.py	2014-11-12 06:57:20 +0000
+++ lib/cdimage/tests/test_livefs.py	2015-06-17 19:11:30 +0000
@@ -983,7 +983,7 @@
         for item in (
             "cloop", "squashfs", "manifest", "manifest-desktop",
             "manifest-remove", "size", "ext2", "ext3", "ext4", "rootfs.tar.gz",
-            "custom.tar.gz", "tar.xz", "iso", "device.tar.gz",
+            "custom.tar.gz", "tar.xz", "iso", "device.tar.gz", "azure.device.tar.gz",
         ):
             self.assertPathsEqual(
                 ["http://kapok.buildd/~buildd/LiveCD/precise/kubuntu/"

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2015-06-02 21:59:46 +0000
+++ lib/cdimage/tree.py	2015-06-17 19:14:01 +0000
@@ -1917,6 +1917,12 @@
                 "%s.device.tar.gz" % source_prefix,
                 "%s.device.tar.gz" % target_prefix)
 
+        if os.path.exists("%s.azure.device.tar.gz" % source_prefix):
+            logger.info("Publishing %s azure device tarball ..." % arch)
+            shutil.move(
+                "%s.azure.device.tar.gz" % source_prefix,
+                "%s.azure.device.tar.gz" % target_prefix)
+
         # zsync metafiles
         if osextras.find_on_path("zsyncmake"):
             logger.info("Making %s zsync metafile ..." % arch)
@@ -2949,7 +2955,8 @@
 
         # Copy, to make sure we have a canonical version of this.
         artifacts = ["iso", "list", "img", "img.gz", "tar.gz", "img.tar.gz",
-                     "tar.xz", "bootimg", "custom.tar.gz", "device.tar.gz"]
+                     "tar.xz", "bootimg", "custom.tar.gz", "device.tar.gz",
+                     "azure.device.tar.gz"]
         for ext in artifacts:
             if not os.path.exists(daily(ext)):
                 continue
Download as text