Merge lp:~xubuntu-dev/ubuntu-cdimage/bionic_image_size into lp:ubuntu-cdimage

[Sean Davis]

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

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

[Steve Langasek (vorlon)]

Would you care to fix up the issues identified inline?

review: Needs Fixing

[lp:~xubuntu-dev/ubuntu-cdimage/bionic_image_size]

1783. By Sean Davis on 2019-02-18

Fix xenial check for xubuntu and ubuntu-gnome

1784. By Sean Davis on 2019-02-18

Remove xenial logic since its handled in the previous elif statement

[Sean Davis (bluesabre)]

Hi Steve, thank you for reviewing.

I was copying the logic employed by ubuntu-gnome. I've adjusted this and simplified the logic since the xenial case is handled for ubuntu-gnome and xubuntu in the previous elif statement.

[Sean Davis (bluesabre)]

Just following up here. Let me know if there are any other changes needed.

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~xubuntu-dev/ubuntu-cdimage/bionic_image_size]

1785. By Sean Davis on 2019-02-24

Increase xubuntu xenial limit to 2GB to match warning

[Sean Davis (bluesabre)]

Thanks for the review. I think it would have used the 1.46 GB limit that was in place which already didn't fit the 1 GB limit the code had before. I've increased the limit to 2 GB just to make it more sane.

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2019-02-19 10:21:08 +0000
+++ lib/cdimage/tree.py	2019-02-24 11:19:01 +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.")
@@ -979,8 +980,7 @@
                 "drive, or a virtual machine.")
         elif (self.project in usb_projects or
                 (self.project == "xubuntu" and series >= "raring") or
-                (self.project == "ubuntu-gnome" and series >= "saucy" and
-                 series << "xenial")):
+                (self.project == "ubuntu-gnome" and series >= "saucy")):
             sentences.append(
                 "Warning: This image is oversized (which is a bug) and will "
                 "not fit onto a 1GB USB stick.")
@@ -1893,9 +1893,8 @@
             # and suppress the warnings
             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
-            return 1460000000
+            # 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"] >= "raring":
             # http://irclogs.ubuntu.com/2013/02/11/%23xubuntu-devel.html#t21:48
             return 1024 * 1024 * 1024