Merge ~racb/git-ubuntu:blacklist-wheezy into git-ubuntu:master

Proposed by Robie Basak
Status: Merged
Merged at revision: a7ac2f2ad2c2a28c1b0e30d8ffe508278e51f452
Proposed branch: ~racb/git-ubuntu:blacklist-wheezy
Merge into: git-ubuntu:master
Diff against target: 45 lines (+20/-1)
1 file modified
gitubuntu/source_information.py (+20/-1)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+366519@code.launchpad.net

Commit message

Make Jenkins happy

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

The actual change LGTM, except the bikeshedding on serieSS

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:28d273cd78877766e6ac9a1c96d216c7d17dad31
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/91/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/91/rebuild

review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:28d273cd78877766e6ac9a1c96d216c7d17dad31
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/92/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/92/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/gitubuntu/source_information.py b/gitubuntu/source_information.py
2index df07607..a367fa7 100644
3--- a/gitubuntu/source_information.py
4+++ b/gitubuntu/source_information.py
5@@ -350,6 +350,14 @@ class NoPublicationHistoryException(Exception):
6
7 # An abstraction of an information source about source packages
8 class GitUbuntuSourceInformation(object):
9+ # Some seriess are listed as active in Launchpad but aren't available via
10+ # apt, so this is a list of those to exclude as a workaround. See
11+ # https://answers.launchpad.net/launchpad/+question/680444
12+ BLACKLISTED_ACTIVE_SERIESS = {
13+ 'debian': frozenset(['wheezy']),
14+ 'ubuntu': frozenset(),
15+ }
16+
17 _all_series_list = None
18 _active_series_list = None
19 _stable_series_list = None
20@@ -403,13 +411,24 @@ class GitUbuntuSourceInformation(object):
21 return self.dist.current_series
22
23 @property
24+ def blacklisted_active_seriess(self):
25+ return self.BLACKLISTED_ACTIVE_SERIESS[self.dist_name]
26+
27+ @property
28 def active_series(self):
29 if self.dist_name.startswith('ppa:'):
30 return []
31 # return a list of series objects sorted with newest first.
32 if self._active_series_list is None:
33 self._active_series_list = sorted(
34- [r for r in self.dist.series if r.active],
35+ [
36+ r
37+ for r in self.dist.series
38+ if (
39+ r.active
40+ and not r.name in self.blacklisted_active_seriess
41+ )
42+ ],
43 key=lambda s: float(s.version),
44 reverse=True,
45 )

Subscribers

People subscribed via source and target branches