Review: Needs Fixing


Diff comments:

> diff --git a/etc/config b/etc/config
> index 524e7d8..12c2dbf 100644
> --- a/etc/config
> +++ b/etc/config
> @@ -51,7 +51,7 @@ case $DIST in
>          ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio 
> lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
>          ;;
>      *)
> -        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio 
> lubuntu ubuntukylin ubuntu-mate ubuntu-budgie ubuntu-unity}"
> +        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu xubuntu-minimal 
> ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie ubuntu-unity}"

This adds it to the list of projects for jammy.  That's probably ok, we don't 
use ALL_PROJECTS for much - and we already have ubuntu-unity added there 
despite not being a jammy release flavor.

>          ;;
>  esac
>  
> diff --git a/etc/default-arches b/etc/default-arches
> index 5572c9f..c4b1af7 100644
> --- a/etc/default-arches
> +++ b/etc/default-arches
> @@ -67,6 +67,7 @@ ubuntustudio                *                       focal-  
>                 amd64
>  
>  xubuntu                      *                       trusty-bionic           
> amd64 i386
>  xubuntu                      *                       focal-                  
> amd64
> +xubuntu-minimal                      *                       *               
>         amd64

just a thought, would you prefer this to be 
https://cdimage.ubuntu.com/xubuntu/daily-minimal instead of 
https://cdimage.ubuntu.com/xubuntu-minimal/daily-live?  It would be more work, 
but it could be done.  Also where do you want releases to happen, 
https://cdimage.ubuntu.com/xubuntu-minimal/releases or 
https://cdimage.ubuntu.com/xubuntu/releases?  That might influence the right 
answer for where we want the dailies published.

>  
>  *                    dvd                     trusty-bionic           amd64 
> i386
>  *                    dvd                     *                       amd64
> diff --git a/etc/qa-products b/etc/qa-products
> index ea32841..e898d7c 100644
> --- a/etc/qa-products
> +++ b/etc/qa-products
> @@ -119,6 +119,7 @@ Ubuntu Unity Desktop amd64                                
>         ubuntu-unity    daily-live                      desktop               
>                   amd64                   iso
>  # Xubuntu
>  Xubuntu Desktop amd64                                                xubuntu 
>                 daily-live                      desktop                       
>           amd64                   iso
>  Xubuntu Desktop i386                                         xubuntu         
>         daily-live                      desktop                               
>   i386                    iso
> +Xubuntu Minimal amd64                                                xubuntu 
>                 daily-live                      desktop                       
>           amd64                   iso

This is conditional on the final disposition of the previous question.

>  
>  # Ubuntu WSL (special case, not built via cdimage)
>  Ubuntu WSL                                                                   
> ubuntu                  wsl                                     desktop       
>                           amd64                   iso
> diff --git a/lib/cdimage/project.py b/lib/cdimage/project.py
> index 8995d68..a9ff3ce 100644
> --- a/lib/cdimage/project.py
> +++ b/lib/cdimage/project.py
> @@ -32,6 +32,7 @@ project_map = {
>      "ubuntu-zh_CN": "Ubuntu Chinese Edition",
>      "kubuntu": "Kubuntu",
>      "xubuntu": "Xubuntu",
> +    "xubuntu-minimal": "Xubuntu-Minimal",

Do you prefer Xubuntu-Minimal or Xubuntu Minimal?  This doesn't match 
etc/qa-products, they should be consistent.

>      "gobuntu": "Gobuntu",
>      "ubuntu-server": "Ubuntu-Server",
>      "ubuntustudio": "Ubuntu-Studio",
> diff --git a/lib/cdimage/tree.py b/lib/cdimage/tree.py
> index 3be7f9a..e319481 100644
> --- a/lib/cdimage/tree.py
> +++ b/lib/cdimage/tree.py
> @@ -1012,7 +1013,8 @@ class Publisher:
>                                 "kubuntu",
>                                 "ubuntu-mate",
>                                 "ubuntu-budgie",
> -                               "xubuntu") and series >= "xenial"):
> +                               "xubuntu",
> +                               "xubuntu-minimal") and series >= "xenial"):

Shouldn't xubuntu-minimal use the oversized message text for CDs rather than 
2GB USB sticks?  (Not that any of this text has been maintained correctly!)

>              sentences.append(
>                  "Warning: This image is oversized (which is a bug) and will "
>                  "not fit onto a 2GB USB stick.")
> @@ -1963,13 +1965,13 @@ class DailyTreePublisher(Publisher):
>                self.config["DIST"] >= "focal"):
>              # Per IRC discussions on #ubuntu-flavors on the 2020-10-05
>              return 4 * 1024 * 1024 * 1024
> -        elif self.project == "xubuntu" and self.config["DIST"] >= "kinetic":
> +        elif self.project in ("xubuntu", "xubuntu-minimal") and 
> self.config["DIST"] >= "kinetic":

Definitely wrong if the whole point of this image is to have an alternative 
that fits on smaller media - if that's the purpose of having an additional 
image then it needs to be acountable to it :)

>              # Per IRC discussions on #ubuntu-release 2022-09-16
>              return 3.0 * 1000 * 1000 * 1000
> -        elif self.project == "xubuntu" and self.config["DIST"] >= "jammy":
> +        elif self.project in ("xubuntu", "xubuntu-minimal") and 
> self.config["DIST"] >= "jammy":
>              # Per IRC discussions on #ubuntu-release 2022-04-17
>              return 2.8 * 1000 * 1000 * 1000
> -        elif self.project in ("ubuntu-budgie", "mythbuntu", "xubuntu",
> +        elif self.project in ("ubuntu-budgie", "mythbuntu", "xubuntu", 
> "xubuntu-minimal",
>                                "ubuntu-gnome", "ubuntu-mate"):
>              # 
> https://lists.ubuntu.com/archives/ubuntu-release/2016-May/003744.html
>              # 
> https://irclogs.ubuntu.com/2019/02/17/%23ubuntu-release.html#t03:04


-- 
https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/435316
Your team Xubuntu Developers is subscribed to branch 
~xubuntu-dev/ubuntu-cdimage:xubuntu-core.


_______________________________________________
Mailing list: https://launchpad.net/~xubuntu-dev
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~xubuntu-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to