From: Brian Warner <warner@lothar.com>
Date: Tue, 19 Mar 2013 19:18:27 +0000 (-0700)
Subject: Makefile: re-enable tarball uploads for "master" branch
X-Git-Tag: allmydata-tahoe-1.10a1
X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/frontends/rgr-080307.php?a=commitdiff_plain;h=9e449db50b6f23c687daa3d928a7aa3479494e10;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: re-enable tarball uploads for "master" branch
---

diff --git a/Makefile b/Makefile
index f4d24b71..cd11acb1 100644
--- a/Makefile
+++ b/Makefile
@@ -288,4 +288,4 @@ tarballs:
 	$(PYTHON) setup.py sdist --sumo --formats=bztar,gztar,zip
 
 upload-tarballs:
-	@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
+	@if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "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