Merge lp:~cjwatson/britney/fix-blocks-function into lp:~ubuntu-release/britney/britney1-ubuntu

Proposed by Colin Watson on 2015-02-19
Status: Merged
Merged at revision: 276
Proposed branch: lp:~cjwatson/britney/fix-blocks-function
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
britney (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/britney/fix-blocks-function
Reviewer Review Type Date Requested Status
Ubuntu Release Team 2015-02-19 Pending
Review via email: mp+250299@code.launchpad.net

Commit message

Return 0 from blocks function for DISTRIBUTION != ubuntu.

Description of the change

https://code.launchpad.net/~cjwatson/britney/sru-config/+merge/249201 broke the blocks function for ubuntu-rtm, because '[ "$DISTRIBUTION" = ubuntu ] || return' causes blocks to return the exit status of the test, which is non-zero. Explicitly returning zero makes it work properly.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'britney'
2--- britney 2015-02-18 15:37:12 +0000
3+++ britney 2015-02-19 13:00:15 +0000
4@@ -164,7 +164,7 @@
5
6 blocks () {
7 local tags
8- [ "$DISTRIBUTION" = ubuntu ] || return
9+ [ "$DISTRIBUTION" = ubuntu ] || return 0
10 mkdir -p "$1/$SERIES-proposed"
11 if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
12 tags="block-proposed block-proposed-$SERIES"

Subscribers

People subscribed via source and target branches