PQM

Merge lp://staging/~jelmer/pqm/shelltest-fixes into lp://staging/pqm

  1. shelltest-fixes
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Robert Collins
Approved revision: 187
Merged at revision: not available
Proposed branch: lp://staging/~jelmer/pqm/shelltest-fixes
Merge into: lp://staging/pqm
Diff against target: 21 lines
1 file modified
tests/test-framework (+8/-0)
To merge this branch: bzr merge lp://staging/~jelmer/pqm/shelltest-fixes
Reviewer Review Type Date Requested Status
Stephen Warren (community) Abstain
pqm developers Pending
Review via email: mp+12444@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Trivial fix to prevent annoying errors about bzr not being found.

Revision history for this message
Stephen Warren (srwarren) wrote :

-x instead of -f?

review: Abstain
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

> -x instead of -f?
I'd rather get an error if that file exists but is not executable, than end up using the system bzr.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test-framework'
2--- tests/test-framework 2009-08-29 12:14:22 +0000
3+++ tests/test-framework 2009-09-25 22:55:17 +0000
4@@ -93,9 +93,17 @@
5
6 pqm_bzr () {
7 # use a bzr from a nested tree of bzr if present, otherwise use the system one.
8+<<<<<<< TREE
9 # outputs ././bzr-merge.sh: 16: /..../tests/../bzr/bzr: not found
10 # but works.
11 ${srcdir}/../bzr/bzr "$@" || bzr "$@"
12+=======
13+ if [ -f ${srcdir}/../bzr/bzr ]; then
14+ ${srcdir}/../bzr/bzr "$@"
15+ else
16+ bzr "$@"
17+ fi
18+>>>>>>> MERGE-SOURCE
19 }
20
21 identity_user1() {

Subscribers

People subscribed via source and target branches

to status/vote changes: