Merge lp:~rosco2/ubuntu-cdimage/ubuntustudio-seeds-git into lp:ubuntu-cdimage

[Steve Langasek]

=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py	2018-05-29 03:36:12 +0000
+++ lib/cdimage/germinate.py	2018-10-18 15:15:25 +0000
@@ -78,7 +78,7 @@
                 else:
                     sources.insert(0, bzrpattern % "ubuntu-core-dev")
             elif project == "ubuntustudio":
-                sources.insert(0, bzrpattern % "ubuntustudio-dev")
+                sources.insert(0, gitpattern % "ubuntustudio-dev")
             elif project == "mythbuntu":
                 sources.insert(0, bzrpattern % "mythbuntu-dev")
             elif project == "xubuntu":

=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py	2018-07-24 06:40:20 +0000
+++ lib/cdimage/tests/test_germinate.py	2018-10-18 15:15:25 +0000
@@ -87,8 +87,6 @@
             ("kubuntu-active", "natty", ["ubuntu-core-dev"]),
             ("kubuntu-active", "oneiric", ["kubuntu-dev"]),
             ("kubuntu-plasma5", "utopic", ["kubuntu-dev"]),
-            ("ubuntustudio", "raring",
-             ["ubuntustudio-dev"]),
             ("mythbuntu", "raring", ["mythbuntu-dev"]),
             ("xubuntu", "hardy", ["ubuntu-core-dev"]),
             ("ubuntu-gnome", "raring",
@@ -115,6 +113,8 @@
             ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
             ("ubuntukylin", "utopic",
              ["ubuntukylin-members", "ubuntu-core-dev"]),
+            ("ubuntustudio", "raring",
+             ["ubuntustudio-dev", "ubuntu-core-dev"]),
         ):
             self.config["DIST"] = series
             sources = [