Merge lp:~tsimonq2/ubuntu-cdimage/add-git-support-to-germinate into lp:ubuntu-cdimage

[Simon Quigley]

This adds support for seeds being in Git rather than Bazaar. It adds a pattern variable much like the existing one to make it extendable for other flavors who also want to convert their seed over, and the usage of the deprecated (says the manpage) `--bzr` flag is replaced by usage of the `--vcs` flag, which makes this backwards-compatible in that it will automatically detect the right VCS (and if it doesn't, tries Git, then tries Bazaar if that doesn't work, so it still automatically works either way). I know the latter change works because I made similar changes in lubuntu-meta 0.87.

Please merge this as soon as possible, because it fixes Lubuntu daily builds.

[Simon Quigley (tsimonq2)]

I also fixed the implementation in the `scripts` branch, but there's no way for me to make an MP there (that I can see) so if this could be reviewed alongside it, that would be great: https://code.launchpad.net/~tsimonq2/+junk/ubuntu-archive-scripts

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~tsimonq2/ubuntu-cdimage/add-git-support-to-germinate]

1693. By Steve Langasek on 2018-01-03

Merge lp:~tsimonq2/ubuntu-cdimage/add-git-support-to-germinate

[Steve Langasek (vorlon)]

review: Approve

=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py	2017-11-19 04:17:30 +0000
+++ lib/cdimage/germinate.py	2018-01-03 22:15:34 +0000
@@ -40,10 +40,10 @@
 
 
 class Germination:
-    def __init__(self, config, prefer_bzr=True):
+    def __init__(self, config, prefer_vcs=True):
         self.config = config
         # Set to False to use old-style seed checkouts.
-        self.prefer_bzr = prefer_bzr
+        self.prefer_vcs = prefer_vcs
 
     @property
     def germinate_path(self):
@@ -67,44 +67,45 @@
     def seed_sources(self, project):
         if self.config["LOCAL_SEEDS"]:
             return [self.config["LOCAL_SEEDS"]]
-        elif self.prefer_bzr:
-            pattern = "http://bazaar.launchpad.net/~%s/ubuntu-seeds/"
+        elif self.prefer_vcs:
+            bzrpattern = "https://bazaar.launchpad.net/~%s/ubuntu-seeds/"
+            gitpattern = "https://git.launchpad.net/~%s/ubuntu-seeds/+git/"
             series = self.config["DIST"]
             sources = [pattern % "ubuntu-core-dev"]
             if project in ("kubuntu", "kubuntu-active", "kubuntu-plasma5"):
                 if series >= "oneiric":
-                    sources.insert(0, pattern % "kubuntu-dev")
+                    sources.insert(0, bzrpattern % "kubuntu-dev")
             elif project == "ubuntustudio":
-                sources.insert(0, pattern % "ubuntustudio-dev")
+                sources.insert(0, bzrpattern % "ubuntustudio-dev")
             elif project == "mythbuntu":
-                sources.insert(0, pattern % "mythbuntu-dev")
+                sources.insert(0, bzrpattern % "mythbuntu-dev")
             elif project == "xubuntu":
                 if series >= "intrepid":
-                    sources.insert(0, pattern % "xubuntu-dev")
+                    sources.insert(0, bzrpattern % "xubuntu-dev")
             elif project in ("lubuntu", "lubuntu-next"):
-                sources.insert(0, pattern % "lubuntu-dev")
+                sources.insert(0, gitpattern % "lubuntu-dev")
             elif project == "ubuntu-gnome":
-                sources.insert(0, pattern % "ubuntu-gnome-dev")
+                sources.insert(0, bzrpattern % "ubuntu-gnome-dev")
             elif project == "ubuntu-budgie":
-                sources.insert(0, pattern % "ubuntubudgie-dev")
+                sources.insert(0, bzrpattern % "ubuntubudgie-dev")
             elif project == "ubuntu-mate":
-                sources.insert(0, pattern % "ubuntu-mate-dev")
+                sources.insert(0, bzrpattern % "ubuntu-mate-dev")
             elif project == "ubuntu-moblin-remix":
-                sources.insert(0, pattern % "moblin")
+                sources.insert(0, bzrpattern % "moblin")
             elif project == "ubuntukylin":
                 if series >= "utopic":
-                    sources.insert(0, pattern % "ubuntukylin-members")
+                    sources.insert(0, bzrpattern % "ubuntukylin-members")
             return sources
         else:
             return ["http://people.canonical.com/~ubuntu-archive/seeds/"]
 
     @property
-    def use_bzr(self):
+    def use_vcs(self):
         if self.config["LOCAL_SEEDS"]:
             # Local changes may well not be committed.
             return False
         else:
-            return self.prefer_bzr
+            return self.prefer_vcs
 
     def make_index(self, project, arch, rel_target, rel_paths):
         target = os.path.join(self.output_dir(project), rel_target)
@@ -200,8 +201,8 @@
             "--components", "main",
             "--no-rdepends",
         ]
-        if self.use_bzr:
-            command.append("--bzr")
+        if self.use_vcs:
+            command.append("--vcs")
         if self.config.image_type == "source":
             command.append("--always-follow-build-depends")
         proxy_check_call(

=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py	2016-12-14 19:02:06 +0000
+++ lib/cdimage/tests/test_germinate.py	2018-01-03 22:15:34 +0000
@@ -112,21 +112,21 @@
             self.assertEqual(sources, self.germination.seed_sources(project))
 
     def test_seed_sources_non_bzr(self):
-        self.germination = Germination(self.config, prefer_bzr=False)
+        self.germination = Germination(self.config, prefer_vcs=False)
         self.config["DIST"] = "raring"
         self.assertEqual(
             ["http://people.canonical.com/~ubuntu-archive/seeds/"],
             self.germination.seed_sources("ubuntu"))
 
-    def test_use_bzr_local_seeds(self):
+    def test_use_vcs_local_seeds(self):
         self.config["LOCAL_SEEDS"] = "http://www.example.org/"
-        self.assertFalse(self.germination.use_bzr)
+        self.assertFalse(self.germination.use_vcs)
 
-    def test_use_bzr_honours_preference(self):
-        self.assertTrue(self.germination.prefer_bzr)
-        self.assertTrue(self.germination.use_bzr)
-        self.germination.prefer_bzr = False
-        self.assertFalse(self.germination.use_bzr)
+    def test_use_vcs_honours_preference(self):
+        self.assertTrue(self.germination.prefer_vcs)
+        self.assertTrue(self.germination.use_vcs)
+        self.germination.prefer_vcs = False
+        self.assertFalse(self.germination.use_vcs)
 
     def test_make_index(self):
         self.config.root = self.use_temp_dir()