Merge ~mwhudson/ubuntu-cdimage:explicit-GENERATE_POOL into ubuntu-cdimage:main

[Michael Hudson-Doyle]

do not run germinate if the image will not have a pool

And set GENERATE_POOL to 0 in this case

[Michael Hudson-Doyle (mwhudson)]

this must not be merged until https://code.launchpad.net/~mwhudson/debian-cd/+git/ubuntu/+merge/465999 is

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

review: Approve

diff --git a/lib/cdimage/build.py b/lib/cdimage/build.py
index 75d93e4..2c41598 100644
--- a/lib/cdimage/build.py
+++ b/lib/cdimage/build.py
@@ -455,20 +455,23 @@ def build_image_set_locked(config, options):
             apt_state_mgr = AptStateManager(config)
             apt_state_mgr.setup()
 
-            log_marker("Germinating")
-            # Cannot use apt_state_mgr for germination until
-            # https://code.launchpad.net/~mwhudson/germinate/+git/
-            #     germinate-1/+merge/456723
-            # is merged.
-            germination = Germination(config)
-            germination.run()
-
-            log_marker("Generating new task lists")
-            germinate_output = germination.output()
-            germinate_output.write_tasks()
-
-            log_marker("Checking for other task changes")
-            germinate_output.update_tasks(date)
+            if config.project == "ubuntu-core-desktop":
+                config["GENERATE_POOL"] = "0"
+            else:
+                log_marker("Germinating")
+                # Cannot use apt_state_mgr for germination until
+                # https://code.launchpad.net/~mwhudson/germinate/+git/
+                #     germinate-1/+merge/456723
+                # is merged.
+                germination = Germination(config)
+                germination.run()
+
+                log_marker("Generating new task lists")
+                germinate_output = germination.output()
+                germinate_output.write_tasks()
+
+                log_marker("Checking for other task changes")
+                germinate_output.update_tasks(date)
 
             if config["CDIMAGE_LIVE"]:
                 log_marker("Downloading live filesystem images")