turnip

Merge ~cjwatson/turnip:bootstrap-test-path into turnip:master

  1. Git
  2. lp:~cjwatson/turnip
  3. bootstrap-test-path
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: c79a6939a56b125b07440663b0e64913e6b67724
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/turnip:bootstrap-test-path
Merge into: turnip:master
Diff against target: 12 lines (+1/-0)
1 file modified
Makefile (+1/-0)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+389772@code.launchpad.net

Commit message

Make sure /usr/sbin is on $PATH for bootstrap-test

Description of the change

rabbitmqctl is in /usr/sbin, which isn't always on $PATH.

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index f907f9c..628d4c8 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -64,6 +64,7 @@ endif
6 $(PIP) install $(PIP_ARGS) -c requirements.txt \
7 -e '.[test,deploy]'
8
9+bootstrap-test: PATH := /usr/sbin:/sbin:$(PATH)
10 bootstrap-test:
11 -sudo rabbitmqctl delete_vhost turnip-test-vhost
12 -sudo rabbitmqctl add_vhost turnip-test-vhost

Subscribers

People subscribed via source and target branches