Ubuntu Developer Tools

Merge lp:~smoser/ubuntu-dev-tools/lp1508948-rmadison-sid-is-unstable into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

  1. lp1508948-rmadison-sid-is-unstable
  2. Merge into trunk
Proposed by Scott Moser
Status: Merged
Merged at revision: 1434
Proposed branch: lp:~smoser/ubuntu-dev-tools/lp1508948-rmadison-sid-is-unstable
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 16 lines (+5/-1)
1 file modified
ubuntutools/archive.py (+5/-1)
To merge this branch: bzr merge lp:~smoser/ubuntu-dev-tools/lp1508948-rmadison-sid-is-unstable
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+275351@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks.

review: Approve
Revision history for this message
Daniel Holbach (dholbach) wrote :

I merged this and added a d/changelog entry for you. Maybe you can coordinate with xnox to get it into Debian and Ubuntu?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntutools/archive.py'
2--- ubuntutools/archive.py 2014-12-18 23:18:00 +0000
3+++ ubuntutools/archive.py 2015-10-22 14:03:06 +0000
4@@ -636,7 +636,11 @@
5 # rmadison returns some results outside the requested set.
6 # It'll include backports, and when given an unknown suite,
7 # it ignores that argument
8- if suite and dist != suite:
9+ #
10+ # some versions (2.14.1ubuntu0.1) of rmadison return 'sid' when
11+ # asked about 'unstable'. Others return 'unstable'. Accept either.
12+ if (suite and dist != suite and not
13+ (suite == 'sid' and dist == 'unstable')):
14 continue
15
16 if 'source' in archs:

Subscribers

People subscribed via source and target branches

to status/vote changes: