Commit 81fce02b authored by Leigh B Stoller's avatar Leigh B Stoller

Rob prefers "current" instead of mothership for the branch name.

parent 0879edca
...@@ -436,7 +436,7 @@ BRANCHECHO= @echo "Skipping branch check since not the Mothership" ...@@ -436,7 +436,7 @@ BRANCHECHO= @echo "Skipping branch check since not the Mothership"
ifeq ($(ISMAINSITE),1) ifeq ($(ISMAINSITE),1)
ifeq ($(TBROOT),/usr/testbed) ifeq ($(TBROOT),/usr/testbed)
BRANCHCHECK= cd $(SRCDIR) && \ BRANCHCHECK= cd $(SRCDIR) && \
git status --porcelain -s -b | head -1 | grep -q -s mothership git status --porcelain -s -b | head -1 | grep -q -s current
BRANCHECHO= @echo "Checking to make sure you are on the mothership branch" BRANCHECHO= @echo "Checking to make sure you are on the mothership branch"
endif endif
endif endif
......
...@@ -113,7 +113,7 @@ default-install: ...@@ -113,7 +113,7 @@ default-install:
ifeq ($(ISMAINSITE),1) ifeq ($(ISMAINSITE),1)
ifeq ($(TBROOT),/usr/testbed/devel/stoller) ifeq ($(TBROOT),/usr/testbed/devel/stoller)
(cd $(SRCDIR) ; \ (cd $(SRCDIR) ; \
git status --porcelain -s -b | head -1 | grep -q -s mothership) git status --porcelain -s -b | head -1 | grep -q -s current)
else else
/usr/bin/true /usr/bin/true
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment