Merge lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate-base into lp:ubuntu-cdimage

Proposed by Martin Wimpress 
Status: Needs review
Proposed branch: lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate-base
Merge into: lp:ubuntu-cdimage
Diff against target: 354 lines (+60/-12)
12 files modified
bin/daily-checks (+3/-1)
etc/config (+1/-1)
etc/crontab (+2/-0)
etc/default-arches (+3/-0)
etc/qa-products (+9/-4)
lib/cdimage/build.py (+2/-0)
lib/cdimage/germinate.py (+2/-2)
lib/cdimage/project.py (+2/-0)
lib/cdimage/tests/test_build.py (+2/-0)
lib/cdimage/tests/test_germinate.py (+3/-0)
lib/cdimage/tests/test_tree.py (+8/-2)
lib/cdimage/tree.py (+23/-2)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate-base
Reviewer Review Type Date Requested Status
Adam Conrad Pending
Ubuntu CD Image Team Pending
Review via email: mp+284433@code.launchpad.net

Description of the change

This merge proposal adds support for Xubuntu Base and Ubuntu MATE Base as discussed with Adam Conrad. The "Base" variants contain a minimal desktop environment suitable for experienced user to craft their own setup.

To post a comment you must log in.

Unmerged revisions

1562. By Martin Wimpress 

Added ubuntu-mate-base.

1561. By Sean Davis

Replace Xubuntu Core with Base

1560. By Sean Davis

Merge in lp:~unit193/ubuntu-cdimage/xubuntu-core

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/daily-checks'
--- bin/daily-checks 2015-10-26 11:06:11 +0000
+++ bin/daily-checks 2016-01-29 11:35:53 +0000
@@ -128,7 +128,7 @@
128 warn(project, image, "%s oversized by %d bytes (%d)" %128 warn(project, image, "%s oversized by %d bytes (%d)" %
129 (iso, size - sizelimit, size))129 (iso, size - sizelimit, size))
130130
131 if project == 'xubuntu':131 if project in ('xubuntu', 'xubuntu-base'):
132 for manifest in filter(132 for manifest in filter(
133 lambda x: x.endswith('.list') or x.endswith('.manifest'),133 lambda x: x.endswith('.list') or x.endswith('.manifest'),
134 files):134 files):
@@ -240,6 +240,7 @@
240 'kubuntu',240 'kubuntu',
241 'edubuntu',241 'edubuntu',
242 'xubuntu',242 'xubuntu',
243 'xubuntu-base',
243 'ubuntustudio',244 'ubuntustudio',
244 'ubuntu-netbook',245 'ubuntu-netbook',
245 'kubuntu-netbook',246 'kubuntu-netbook',
@@ -250,6 +251,7 @@
250 'lubuntu',251 'lubuntu',
251 'ubuntu-gnome',252 'ubuntu-gnome',
252 'ubuntu-mate',253 'ubuntu-mate',
254 'ubuntu-mate-base',
253 'ubuntukylin',255 'ubuntukylin',
254 )256 )
255 if not options.series:257 if not options.series:
256258
=== modified file 'etc/config'
--- etc/config 2015-11-11 20:07:52 +0000
+++ etc/config 2016-01-29 11:35:53 +0000
@@ -45,7 +45,7 @@
45 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin}"45 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin}"
46 ;;46 ;;
47 *)47 *)
48 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate ubuntu-desktop-next}"48 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu xubuntu-base ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate ubuntu-mate-base ubuntu-desktop-next}"
49 ;;49 ;;
50esac50esac
5151
5252
=== modified file 'etc/crontab'
--- etc/crontab 2016-01-08 13:36:12 +0000
+++ etc/crontab 2016-01-29 11:35:53 +0000
@@ -23,6 +23,7 @@
2314 5 * * * for-project kubuntu cron.daily-live --live2314 5 * * * for-project kubuntu cron.daily-live --live
2424 0 * * * for-project edubuntu cron.dvd --live2424 0 * * * for-project edubuntu cron.dvd --live
2550 9 * * * for-project xubuntu cron.daily-live --live2550 9 * * * for-project xubuntu cron.daily-live --live
2650 10 * * * for-project xubuntu-base cron.daily-live --live
2629 6 * * * for-project ubuntu-server cron.daily --live2729 6 * * * for-project ubuntu-server cron.daily --live
2717 18 * * * for-project ubuntustudio cron.dvd --live2817 18 * * * for-project ubuntustudio cron.dvd --live
28# mythbuntu will only release for LTS releases, but we keep daily builds around to ensure it remains working29# mythbuntu will only release for LTS releases, but we keep daily builds around to ensure it remains working
@@ -35,6 +36,7 @@
3514 22 * * * for-project ubuntukylin cron.daily-live --live3614 22 * * * for-project ubuntukylin cron.daily-live --live
3632 15 * * * for-project ubuntu-gnome cron.daily-live --live3732 15 * * * for-project ubuntu-gnome cron.daily-live --live
3746 2 * * * for-project ubuntu-mate cron.daily-live --live3846 2 * * * for-project ubuntu-mate cron.daily-live --live
3946 3 * * * for-project ubuntu-mate-base cron.daily-live --live
3840
39# XXX: Note that the EXTRA_PPAS bit here also needs to be mirrored in rebuild-requests:41# XXX: Note that the EXTRA_PPAS bit here also needs to be mirrored in rebuild-requests:
4003 2 * * 2-6 DIST=vivid EXTRA_PPAS=ci-train-ppa-service/stable-phone-overlay:1001 for-project ubuntu-touch cron.daily-preinstalled --live4203 2 * * 2-6 DIST=vivid EXTRA_PPAS=ci-train-ppa-service/stable-phone-overlay:1001 for-project ubuntu-touch cron.daily-preinstalled --live
4143
=== modified file 'etc/default-arches'
--- etc/default-arches 2015-12-08 13:17:26 +0000
+++ etc/default-arches 2016-01-29 11:35:53 +0000
@@ -63,6 +63,7 @@
63ubuntu-gnome * * amd64 i38663ubuntu-gnome * * amd64 i386
6464
65ubuntu-mate * * amd64 i386 powerpc65ubuntu-mate * * amd64 i386 powerpc
66ubuntu-mate-base * * amd64 i386 powerpc
6667
67ubuntu-mid * * lpia68ubuntu-mid * * lpia
6869
@@ -97,6 +98,8 @@
97xubuntu * feisty-maverick amd64 i386 powerpc powerpc+ps398xubuntu * feisty-maverick amd64 i386 powerpc powerpc+ps3
98xubuntu * natty- amd64 i38699xubuntu * natty- amd64 i386
99100
101xubuntu-base * * amd64 i386
102
100* daily-live gutsy-intrepid amd64 i386 ia64 powerpc powerpc+ps3 sparc103* daily-live gutsy-intrepid amd64 i386 ia64 powerpc powerpc+ps3 sparc
101* daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 sparc104* daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 sparc
102* daily-live karmic amd64 i386 ia64 powerpc powerpc+ps3 sparc105* daily-live karmic amd64 i386 ia64 powerpc powerpc+ps3 sparc
103106
=== modified file 'etc/qa-products'
--- etc/qa-products 2015-12-08 13:17:26 +0000
+++ etc/qa-products 2016-01-29 11:35:53 +0000
@@ -58,10 +58,13 @@
58Ubuntu GNOME Desktop amd64 ubuntu-gnome daily-live desktop amd64 iso58Ubuntu GNOME Desktop amd64 ubuntu-gnome daily-live desktop amd64 iso
59Ubuntu GNOME Desktop i386 ubuntu-gnome daily-live desktop i386 iso59Ubuntu GNOME Desktop i386 ubuntu-gnome daily-live desktop i386 iso
6060
61# Ubuntu Mate61# Ubuntu MATE
62Ubuntu Mate Desktop amd64 ubuntu-mate daily-live desktop amd64 iso62Ubuntu MATE Desktop amd64 ubuntu-mate daily-live desktop amd64 iso
63Ubuntu Mate Desktop i386 ubuntu-mate daily-live desktop i386 iso63Ubuntu MATE Desktop i386 ubuntu-mate daily-live desktop i386 iso
64Ubuntu Mate Desktop powerpc ubuntu-mate daily-live desktop powerpc iso64Ubuntu MATE Desktop powerpc ubuntu-mate daily-live desktop powerpc iso
65Ubuntu MATE Base amd64 ubuntu-mate-base daily-live base amd64 iso
66Ubuntu MATE Base i386 ubuntu-mate-base daily-live base i386 iso
67Ubuntu MATE Base powerpc ubuntu-mate-base daily-live base powerpc iso
6568
66# Ubuntu Server69# Ubuntu Server
67Ubuntu Server amd64 ubuntu-server daily server amd64 iso70Ubuntu Server amd64 ubuntu-server daily server amd64 iso
@@ -90,5 +93,7 @@
90Ubuntu Kylin Desktop i386 ubuntukylin daily-live desktop i386 iso93Ubuntu Kylin Desktop i386 ubuntukylin daily-live desktop i386 iso
9194
92# Xubuntu95# Xubuntu
96Xubuntu Base amd64 xubuntu-base daily-live base amd64 iso
97Xubuntu Base i386 xubuntu-base daily-live base i386 iso
93Xubuntu Desktop amd64 xubuntu daily-live desktop amd64 iso98Xubuntu Desktop amd64 xubuntu daily-live desktop amd64 iso
94Xubuntu Desktop i386 xubuntu daily-live desktop i386 iso99Xubuntu Desktop i386 xubuntu daily-live desktop i386 iso
95100
=== modified file 'lib/cdimage/build.py'
--- lib/cdimage/build.py 2015-12-09 12:31:46 +0000
+++ lib/cdimage/build.py 2016-01-29 11:35:53 +0000
@@ -97,8 +97,10 @@
97 "ubuntukylin",97 "ubuntukylin",
98 "ubuntu-gnome",98 "ubuntu-gnome",
99 "ubuntu-mate",99 "ubuntu-mate",
100 "ubuntu-mate-base",
100 "ubuntu-moblin-remix",101 "ubuntu-moblin-remix",
101 "ubuntu-mid",102 "ubuntu-mid",
103 "xubuntu-base",
102 ):104 ):
103 config["CDIMAGE_UNSUPPORTED"] = "1"105 config["CDIMAGE_UNSUPPORTED"] = "1"
104106
105107
=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py 2015-10-26 11:06:11 +0000
+++ lib/cdimage/germinate.py 2016-01-29 11:35:53 +0000
@@ -78,14 +78,14 @@
78 sources.insert(0, pattern % "ubuntustudio-dev")78 sources.insert(0, pattern % "ubuntustudio-dev")
79 elif project == "mythbuntu":79 elif project == "mythbuntu":
80 sources.insert(0, pattern % "mythbuntu-dev")80 sources.insert(0, pattern % "mythbuntu-dev")
81 elif project == "xubuntu":81 elif project in ("xubuntu", "xubuntu-base"):
82 if series >= "intrepid":82 if series >= "intrepid":
83 sources.insert(0, pattern % "xubuntu-dev")83 sources.insert(0, pattern % "xubuntu-dev")
84 elif project == "lubuntu":84 elif project == "lubuntu":
85 sources.insert(0, pattern % "lubuntu-dev")85 sources.insert(0, pattern % "lubuntu-dev")
86 elif project == "ubuntu-gnome":86 elif project == "ubuntu-gnome":
87 sources.insert(0, pattern % "ubuntu-gnome-dev")87 sources.insert(0, pattern % "ubuntu-gnome-dev")
88 elif project == "ubuntu-mate":88 elif project in ("ubuntu-mate", "ubuntu-mate-base"):
89 sources.insert(0, pattern % "ubuntu-mate-dev")89 sources.insert(0, pattern % "ubuntu-mate-dev")
90 elif project == "ubuntu-moblin-remix":90 elif project == "ubuntu-moblin-remix":
91 sources.insert(0, pattern % "moblin")91 sources.insert(0, pattern % "moblin")
9292
=== modified file 'lib/cdimage/project.py'
--- lib/cdimage/project.py 2015-09-21 11:04:35 +0000
+++ lib/cdimage/project.py 2016-01-29 11:35:53 +0000
@@ -36,6 +36,7 @@
36 "kubuntu-plasma5": "Kubuntu-Plasma-5",36 "kubuntu-plasma5": "Kubuntu-Plasma-5",
37 "edubuntu": "Edubuntu",37 "edubuntu": "Edubuntu",
38 "xubuntu": "Xubuntu",38 "xubuntu": "Xubuntu",
39 "xubuntu-base": "Xubuntu-Base",
39 "gobuntu": "Gobuntu",40 "gobuntu": "Gobuntu",
40 "ubuntu-server": "Ubuntu-Server",41 "ubuntu-server": "Ubuntu-Server",
41 "jeos": "Ubuntu-JeOS",42 "jeos": "Ubuntu-JeOS",
@@ -48,6 +49,7 @@
48 "ubuntukylin": "Ubuntu-Kylin",49 "ubuntukylin": "Ubuntu-Kylin",
49 "ubuntu-gnome": "Ubuntu-GNOME",50 "ubuntu-gnome": "Ubuntu-GNOME",
50 "ubuntu-mate": "Ubuntu-MATE",51 "ubuntu-mate": "Ubuntu-MATE",
52 "ubuntu-mate-base": "Ubuntu-MATE-Base",
51 "ubuntu-moblin-remix": "Ubuntu-Moblin-Remix",53 "ubuntu-moblin-remix": "Ubuntu-Moblin-Remix",
52 "livecd-base": "LiveCD-Base",54 "livecd-base": "LiveCD-Base",
53 "ubuntu-core": "Ubuntu-Core",55 "ubuntu-core": "Ubuntu-Core",
5456
=== modified file 'lib/cdimage/tests/test_build.py'
--- lib/cdimage/tests/test_build.py 2015-12-09 12:31:46 +0000
+++ lib/cdimage/tests/test_build.py 2016-01-29 11:35:53 +0000
@@ -536,6 +536,7 @@
536 ("edubuntu", "karmic", False, True),536 ("edubuntu", "karmic", False, True),
537 ("xubuntu", "gutsy", False, False),537 ("xubuntu", "gutsy", False, False),
538 ("xubuntu", "hardy", False, True),538 ("xubuntu", "hardy", False, True),
539 ("xubuntu-base", "wily", False, True),
539 ("kubuntu", "precise", False, False),540 ("kubuntu", "precise", False, False),
540 ("kubuntu", "quantal", False, True),541 ("kubuntu", "quantal", False, True),
541 ("kubuntu-active", "raring", False, True),542 ("kubuntu-active", "raring", False, True),
@@ -546,6 +547,7 @@
546 ("ubuntukylin", "raring", False, True),547 ("ubuntukylin", "raring", False, True),
547 ("ubuntu-gnome", "raring", False, True),548 ("ubuntu-gnome", "raring", False, True),
548 ("ubuntu-mate", "vivid", False, True),549 ("ubuntu-mate", "vivid", False, True),
550 ("ubuntu-mate-base", "xenial", False, True),
549 ("ubuntu-moblin-remix", "raring", False, True),551 ("ubuntu-moblin-remix", "raring", False, True),
550 ("ubuntu-desktop-next", "utopic", False, False),552 ("ubuntu-desktop-next", "utopic", False, False),
551 ):553 ):
552554
=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py 2015-10-26 11:06:11 +0000
+++ lib/cdimage/tests/test_germinate.py 2016-01-29 11:35:53 +0000
@@ -93,11 +93,14 @@
93 ("mythbuntu", "raring", ["mythbuntu-dev", "ubuntu-core-dev"]),93 ("mythbuntu", "raring", ["mythbuntu-dev", "ubuntu-core-dev"]),
94 ("xubuntu", "hardy", ["ubuntu-core-dev"]),94 ("xubuntu", "hardy", ["ubuntu-core-dev"]),
95 ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),95 ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
96 ("xubuntu-base", "wily", ["xubuntu-dev", "ubuntu-core-dev"]),
96 ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),97 ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
97 ("ubuntu-gnome", "raring",98 ("ubuntu-gnome", "raring",
98 ["ubuntu-gnome-dev", "ubuntu-core-dev"]),99 ["ubuntu-gnome-dev", "ubuntu-core-dev"]),
99 ("ubuntu-mate", "vivid",100 ("ubuntu-mate", "vivid",
100 ["ubuntu-mate-dev", "ubuntu-core-dev"]),101 ["ubuntu-mate-dev", "ubuntu-core-dev"]),
102 ("ubuntu-mate-base", "xenial",
103 ["ubuntu-mate-dev", "ubuntu-core-dev"]),
101 ("ubuntu-moblin-remix", "hardy", ["moblin", "ubuntu-core-dev"]),104 ("ubuntu-moblin-remix", "hardy", ["moblin", "ubuntu-core-dev"]),
102 ("ubuntukylin", "trusty", ["ubuntu-core-dev"]),105 ("ubuntukylin", "trusty", ["ubuntu-core-dev"]),
103 ("ubuntukylin", "utopic",106 ("ubuntukylin", "utopic",
104107
=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py 2015-12-08 13:17:26 +0000
+++ lib/cdimage/tests/test_tree.py 2016-01-29 11:35:53 +0000
@@ -714,8 +714,10 @@
714 ("ubuntu", "trusty", "daily-live", "powerpc", 1073741824),714 ("ubuntu", "trusty", "daily-live", "powerpc", 1073741824),
715 ("xubuntu", "quantal", "daily-live", "i386", 736665600),715 ("xubuntu", "quantal", "daily-live", "i386", 736665600),
716 ("xubuntu", "raring", "daily-live", "i386", 1073741824),716 ("xubuntu", "raring", "daily-live", "i386", 1073741824),
717 ("xubuntu-base", None, "daily-live", "i386", 736665600),
717 ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),718 ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824),
718 ("ubuntu-mate", None, "daily-live", "amd64", 1073741824),719 ("ubuntu-mate", None, "daily-live", "amd64", 1073741824),
720 ("ubuntu-mate-base", None, "daily-live", "amd64", 736665600),
719 ):721 ):
720 if dist is not None:722 if dist is not None:
721 self.config["DIST"] = dist723 self.config["DIST"] = dist
@@ -1198,6 +1200,7 @@
1198 "Kubuntu Plasma 5 Desktop"),1200 "Kubuntu Plasma 5 Desktop"),
1199 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),1201 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
1200 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),1202 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
1203 ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
1201 ("ubuntu-server", "daily", "server", "Ubuntu Server"),1204 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
1202 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),1205 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
1203 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),1206 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
@@ -1206,7 +1209,8 @@
1206 ("ubuntu-core", "daily", "core", "Ubuntu Core"),1209 ("ubuntu-core", "daily", "core", "Ubuntu Core"),
1207 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),1210 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
1208 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),1211 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
1209 ("ubuntu-mate", "daily-live", "desktop", "Ubuntu Mate Desktop"),1212 ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
1213 ("ubuntu-mate-base", "daily-live", "base", "Ubuntu MATE Base"),
1210 ("ubuntu-desktop-next", "daily-preinstalled",1214 ("ubuntu-desktop-next", "daily-preinstalled",
1211 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),1215 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
1212 ):1216 ):
@@ -1259,6 +1263,7 @@
1259 "Kubuntu Plasma 5 Desktop"),1263 "Kubuntu Plasma 5 Desktop"),
1260 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),1264 ("edubuntu", "dvd", "dvd", "Edubuntu DVD"),
1261 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),1265 ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"),
1266 ("xubuntu-base", "daily-live", "base", "Xubuntu Base"),
1262 ("ubuntu-server", "daily", "server", "Ubuntu Server"),1267 ("ubuntu-server", "daily", "server", "Ubuntu Server"),
1263 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),1268 ("ubuntustudio", "dvd", "dvd", "Ubuntu Studio DVD"),
1264 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),1269 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
@@ -1267,7 +1272,8 @@
1267 ("ubuntu-core", "daily", "core", "Ubuntu Core"),1272 ("ubuntu-core", "daily", "core", "Ubuntu Core"),
1268 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),1273 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
1269 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),1274 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
1270 ("ubuntu-mate", "daily-live", "desktop", "Ubuntu Mate Desktop"),1275 ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"),
1276 ("ubuntu-mate-base", "daily-live", "base", "Ubuntu MATE Base"),
1271 ("ubuntu-desktop-next/system-image", "daily-preinstalled",1277 ("ubuntu-desktop-next/system-image", "daily-preinstalled",
1272 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),1278 "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"),
1273 ):1279 ):
12741280
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py 2015-12-08 13:17:26 +0000
+++ lib/cdimage/tree.py 2016-01-29 11:35:53 +0000
@@ -70,12 +70,14 @@
70 "ubuntu-desktop-next",70 "ubuntu-desktop-next",
71 "ubuntu-gnome",71 "ubuntu-gnome",
72 "ubuntu-mate",72 "ubuntu-mate",
73 "ubuntu-mate-base",
73 "ubuntu-headless",74 "ubuntu-headless",
74 "ubuntu-netbook",75 "ubuntu-netbook",
75 "ubuntu-server",76 "ubuntu-server",
76 "ubuntukylin",77 "ubuntukylin",
77 "ubuntustudio",78 "ubuntustudio",
78 "xubuntu",79 "xubuntu",
80 "xubuntu-base",
79]81]
8082
8183
@@ -155,6 +157,10 @@
155 """Return the per-project base directory within this tree."""157 """Return the per-project base directory within this tree."""
156 if self.config.project == "ubuntu":158 if self.config.project == "ubuntu":
157 return self.directory159 return self.directory
160 elif self.config.project == "xubuntu-base":
161 return os.path.join(self.directory, "xubuntu")
162 elif self.config.project == "ubuntu-mate-base":
163 return os.path.join(self.directory, "ubuntu-mate")
158 else:164 else:
159 return os.path.join(self.directory, self.config.project)165 return os.path.join(self.directory, self.config.project)
160166
@@ -400,6 +406,9 @@
400 return "netbook"406 return "netbook"
401 elif self.project == "ubuntu-server":407 elif self.project == "ubuntu-server":
402 return "live"408 return "live"
409 elif self.project == "xubuntu-base" or \
410 self.project == "ubuntu-mate-base":
411 return "base"
403 else:412 else:
404 if self.config["DIST"] <= "breezy":413 if self.config["DIST"] <= "breezy":
405 return "live"414 return "live"
@@ -432,12 +441,15 @@
432441
433 # Keep this in sync with publish_type above.442 # Keep this in sync with publish_type above.
434 @staticmethod443 @staticmethod
435 def _guess_image_type(publish_type):444 def _guess_image_type(self, publish_type):
436 if publish_type.startswith("preinstalled-"):445 if publish_type.startswith("preinstalled-"):
437 return "daily-preinstalled"446 return "daily-preinstalled"
438 elif publish_type in (447 elif publish_type in (
439 "desktop", "live", "mid", "moblin-remix", "netbook"):448 "desktop", "live", "mid", "moblin-remix", "netbook"):
440 return "daily-live"449 return "daily-live"
450 elif publish_type == "base" and \
451 (self.project == "xubuntu-base" or self.project == "ubuntu-mate-base"):
452 return "daily-live"
441 elif publish_type == "dvd":453 elif publish_type == "dvd":
442 return "dvd"454 return "dvd"
443 elif publish_type in (455 elif publish_type in (
@@ -490,6 +502,8 @@
490 return "live %s" % cd502 return "live %s" % cd
491 elif publish_type == "desktop":503 elif publish_type == "desktop":
492 return "desktop %s" % cd504 return "desktop %s" % cd
505 elif publish_type == "base":
506 return "base %s" % cd
493 elif publish_type == "install":507 elif publish_type == "install":
494 return "install %s" % cd508 return "install %s" % cd
495 elif publish_type == "alternate":509 elif publish_type == "alternate":
@@ -547,7 +561,7 @@
547 if self.project == "mid":561 if self.project == "mid":
548 # MID has lower memory requirements than others562 # MID has lower memory requirements than others
549 desktop_ram = 128563 desktop_ram = 128
550 if self.project == "xubuntu":564 if self.project in ("xubuntu", "xubuntu-base"):
551 if series <= "intrepid":565 if series <= "intrepid":
552 desktop_ram = 128566 desktop_ram = 128
553 else:567 else:
@@ -609,6 +623,12 @@
609 sentences.append(623 sentences.append(
610 "You can install additional educational programs using "624 "You can install additional educational programs using "
611 "the classroom server add-on %s." % cd)625 "the classroom server add-on %s." % cd)
626 elif publish_type == "base" and \
627 (self.project == "xubuntu-base" or self.project == "ubuntu-mate-base"):
628 sentences.append(
629 "The base %s allows you to try %s without changing your "
630 "computer at all, and at your option to install it "
631 "permanently later." % (cd, capproject))
612 elif publish_type == "install":632 elif publish_type == "install":
613 sentences.append(633 sentences.append(
614 "The install %s allows you to install %s permanently on a "634 "The install %s allows you to install %s permanently on a "
@@ -1107,6 +1127,7 @@
11071127
1108 all_publish_types = (1128 all_publish_types = (
1109 "live", "desktop",1129 "live", "desktop",
1130 "base",
1110 "server", "install", "alternate",1131 "server", "install", "alternate",
1111 "serveraddon", "addon",1132 "serveraddon", "addon",
1112 "dvd",1133 "dvd",

Subscribers

People subscribed via source and target branches