launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/fix-find-changed-files into lp:launchpad.

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/fix-find-changed-files/+merge/367534

I broke this in https://code.launchpad.net/~cjwatson/launchpad/find-changed-files-git/+merge/364441.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/fix-find-changed-files into lp:launchpad.

=== modified file 'utilities/find-changed-files.sh'
--- utilities/find-changed-files.sh	2019-04-09 13:46:38 +0000
+++ utilities/find-changed-files.sh	2019-05-16 14:04:13 +0000
@@ -36,8 +36,7 @@
     bzr diff > /dev/null || diff_status=$?
     if [ $diff_status -eq 0 ] ; then
         # No uncommitted changes in the tree.
-        bzr status | grep "^Current thread:" > /dev/null
-        if [ $? -eq 0 ] ; then
+        if bzr status | grep -q "^Current thread:"; then
             # This is a loom, lint changes relative to the lower thread.
             rev_option="-r thread:"
         elif [ "$(bzr pipes | sed -n -e "/^\\*/q;p" | wc -l)" -gt 0 ]; then