← Back to branch summary

~xubuntu-dev/ubuntu-cdimage/xubuntu-base

« back to all changes in this revision

Viewing changes to lib/cdimage/germinate.py

  • Committer: Sean Davis
  • Date: 2018-06-02 00:21:13 UTC
  • mfrom: (1559.1.177 cdimage)
  • Revision ID: smd.seandavis@gmail.com-20180602002113-utt3lq0t65i43cmf
Merge lp:ubuntu-cdimage revno 1736, add optional project param to _guess_image_type to disambiguate

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cdimage/germinate.py
71
71
            bzrpattern = "http://bazaar.launchpad.net/~%s/ubuntu-seeds/"
72
72
            gitpattern = "https://git.launchpad.net/~%s/ubuntu-seeds/+git/"
73
73
            series = self.config["DIST"]
74
 
            sources = [bzrpattern % "ubuntu-core-dev"]
 
74
            sources = [gitpattern % "ubuntu-core-dev"]
75
75
            if project in ("kubuntu", "kubuntu-active", "kubuntu-plasma5"):
76
76
                if series >= "oneiric":
77
77
                    sources.insert(0, bzrpattern % "kubuntu-dev")
 
78
                else:
 
79
                    sources.insert(0, bzrpattern % "ubuntu-core-dev")
78
80
            elif project == "ubuntustudio":
79
81
                sources.insert(0, bzrpattern % "ubuntustudio-dev")
80
82
            elif project == "mythbuntu":
81
83
                sources.insert(0, bzrpattern % "mythbuntu-dev")
82
84
            elif project in ("xubuntu", "xubuntu-base"):
83
85
                if series >= "intrepid":
84
 
                    sources.insert(0, bzrpattern % "xubuntu-dev")
 
86
                    sources.insert(0, gitpattern % "xubuntu-dev")
 
87
                else:
 
88
                    sources.insert(0, bzrpattern % "ubuntu-core-dev")
85
89
            elif project in ("lubuntu", "lubuntu-next"):
86
90
                sources.insert(0, gitpattern % "lubuntu-dev")
87
91
            elif project == "ubuntu-gnome":
94
98
                sources.insert(0, bzrpattern % "moblin")
95
99
            elif project == "ubuntukylin":
96
100
                if series >= "utopic":
97
 
                    sources.insert(0, bzrpattern % "ubuntukylin-members")
 
101
                    sources.insert(0, gitpattern % "ubuntukylin-members")
 
102
                else:
 
103
                    sources.insert(0, bzrpattern % "ubuntu-core-dev")
98
104
            return sources
99
105
        else:
100
106
            return ["http://people.canonical.com/~ubuntu-archive/seeds/"]
363
369
        elif mode == "ship-live":
364
370
            if project == "kubuntu-active":
365
371
                yield "ship-active-live"
366
 
            elif project == "lubuntu" and series >= "artful":
 
372
            elif (project == "lubuntu" and series >= "artful"
 
373
                  and series <= "bionic"):
367
374
                yield "ship-live-gtk"
368
375
                yield "ship-live-share"
369
 
            elif project == "lubuntu-next" and series >= "artful":
 
376
            elif (project == "lubuntu-next" and series >= "artful"
 
377
                  and series <= "bionic"):
370
378
                yield "ship-live-qt"
371
379
                yield "ship-live-share"
372
380
            else: