From: david-sarah <david-sarah@jacaranda.org>
Date: Sun, 28 Nov 2010 23:35:12 +0000 (-0800)
Subject: Makefile: BB_BRANCH is set to the empty string for trunk, not the string 'trunk'.
X-Git-Url: https://git.rkrishnan.org/somewhere?a=commitdiff_plain;h=882e0970652694f4cc44cc2f29c246ce3a02ea8e;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: BB_BRANCH is set to the empty string for trunk, not the string 'trunk'.
---

diff --git a/Makefile b/Makefile
index a5c11adc..67e46b25 100644
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,7 @@ tarballs:
 	$(PYTHON) setup.py sdist --sumo --formats=bztar,gztar,zip
 
 upload-tarballs:
-	@if [ "X${BB_BRANCH}" == "Xtrunk" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
+	@if [ "X${BB_BRANCH}" == "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
 
 # DEBIAN PACKAGING