Merge lp:~cjwatson/britney/sru-lock into lp:~ubuntu-release/britney/britney1-ubuntu

Proposed by Colin Watson
Status: Merged
Merged at revision: 278
Proposed branch: lp:~cjwatson/britney/sru-lock
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 11 lines (+1/-1)
1 file modified
britney (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/britney/sru-lock
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+250333@code.launchpad.net

Commit message

Make the lock file be per-series as well as per-distribution.

Description of the change

Make the lock file be per-series as well as per-distribution. We need this in order to run proposed-migration against Ubuntu stable series (and we should have noticed this when setting it up for ubuntu-rtm/14.09-factory).

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 15:38:09 +0000
4@@ -46,7 +46,7 @@
5 UPDATE_OUT=$CODE/update_out
6 URGENCIES=$INPUT/urgencies
7
8-LOCK=$LOCKDIR/britney-$DISTRIBUTION.lock
9+LOCK=$LOCKDIR/britney-$DISTRIBUTION-$SERIES.lock
10 DAK_LOCK=$DAK_LOCKDIR/daily.lock
11 DAK_STOP=$DAK_LOCKDIR/archive.stop
12

Subscribers

People subscribed via source and target branches