xubuntu-dev team mailing list archive

[Sean Davis <bluesabre@xxxxxxxxxx>]

Sean Davis has proposed merging lp:~xubuntu-dev/ubuntu-cdimage/bionic_image_size into lp:ubuntu-cdimage.

Commit message:
Adjust Xubuntu image sizes, Xenial requires larger than a 1GB USB stick while Bionic and newer have a 2GB limit

Requested reviews:
  Ubuntu CD Image Team (ubuntu-cdimage)

For more details, see:
https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/bionic_image_size/+merge/363298

Adjust Xubuntu image sizes:
- Xenial requires larger than a 1GB USB stick
- Bionic and newer have a 2GB limit
-- 
Your team Xubuntu Developers is subscribed to branch lp:~xubuntu-dev/ubuntu-cdimage/bionic_image_size.

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2019-02-14 22:19:28 +0000
+++ lib/cdimage/tree.py	2019-02-17 20:10:44 +0000
@@ -970,7 +970,8 @@
         elif (self.project in ("ubuntu-gnome",
                                "kubuntu",
                                "ubuntu-mate",
-                               "ubuntu-budgie") and series >= "xenial"):
+                               "ubuntu-budgie",
+                               "xubuntu") and series >= "xenial"):
             sentences.append(
                 "Warning: This image is oversized (which is a bug) and will "
                 "not fit onto a 2GB USB stick.")
@@ -978,7 +979,8 @@
                 "However, you may still test it using a DVD, a larger USB "
                 "drive, or a virtual machine.")
         elif (self.project in usb_projects or
-                (self.project == "xubuntu" and series >= "raring") or
+                (self.project == "xubuntu" and series >= "raring" and
+                 series << "xenial") or
                 (self.project == "ubuntu-gnome" and series >= "saucy" and
                  series << "xenial")):
             sentences.append(
@@ -1886,9 +1888,11 @@
             # oversized; executive decision by vorlon to raise the limit
             # and suppress the warnings
             return 2 * 1000 * 1000 * 1000
+        elif self.project == "xubuntu" and self.config["DIST"] >= "bionic":
+            # https://irclogs.ubuntu.com/2019/02/17/%23ubuntu-release.html#t03:04
+            return 2 * 1000 * 1000 * 1000
         elif self.project == "xubuntu" and self.config["DIST"] >= "xenial":
-            # http://irclogs.ubuntu.com/2016/03/09/
-            #   %23ubuntu-release.html#t12:11
+            # http://irclogs.ubuntu.com/2016/03/09/%23ubuntu-release.html#t12:11
             return 1460000000
         elif self.project == "xubuntu" and self.config["DIST"] >= "raring":
             # http://irclogs.ubuntu.com/2013/02/11/%23xubuntu-devel.html#t21:48