From: david-sarah <david-sarah@jacaranda.org>
Date: Sat, 15 Jan 2011 21:22:11 +0000 (-0800)
Subject: Makefile: allow tarball upload when either BB_BRANCH=='trunk' or BB_BRANCH==''.
X-Git-Url: https://git.rkrishnan.org/components/%22news.html/COPYING.GPL?a=commitdiff_plain;h=21f678527e0c9dfd8705fa6f0927362ec5c23521;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: allow tarball upload when either BB_BRANCH=='trunk' or BB_BRANCH==''.
---

diff --git a/Makefile b/Makefile
index 809067cd..9096215d 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}" == "Xtrunk" ] || [ "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