Launchpad itself

Merge lp:~cjwatson/launchpad/fix-find-changed-files into lp:launchpad

  1. fix-find-changed-files
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18965
Proposed branch: lp:~cjwatson/launchpad/fix-find-changed-files
Merge into: lp:launchpad
Diff against target: 13 lines (+1/-2)
1 file modified
utilities/find-changed-files.sh (+1/-2)
To merge this branch: bzr merge lp:~cjwatson/launchpad/fix-find-changed-files
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Launchpad code reviewers Pending
Review via email: mp+367534@code.launchpad.net

Commit message

Fix "bzr status" handling in find-changed-files.sh to cope with "set -e".

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/find-changed-files.sh'
2--- utilities/find-changed-files.sh 2019-04-09 13:46:38 +0000
3+++ utilities/find-changed-files.sh 2019-05-16 14:04:13 +0000
4@@ -36,8 +36,7 @@
5 bzr diff > /dev/null || diff_status=$?
6 if [ $diff_status -eq 0 ] ; then
7 # No uncommitted changes in the tree.
8- bzr status | grep "^Current thread:" > /dev/null
9- if [ $? -eq 0 ] ; then
10+ if bzr status | grep -q "^Current thread:"; then
11 # This is a loom, lint changes relative to the lower thread.
12 rev_option="-r thread:"
13 elif [ "$(bzr pipes | sed -n -e "/^\\*/q;p" | wc -l)" -gt 0 ]; then