From f5917cd6b8fdfd377116b990f05a05cef66b085d Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 18 Jun 2010 20:49:28 -0700
Subject: [PATCH] setup: in the Makefile, refuse to upload tarballs unless
 someone has passed the environment variable "BB_BRANCH" with value "trunk"

---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0bd474b7..3e4be601 100644
--- a/Makefile
+++ b/Makefile
@@ -285,9 +285,7 @@ tarballs:
 	$(PYTHON) setup.py sdist --sumo --formats=bztar,gztar,zip
 
 upload-tarballs:
-	for f in dist/allmydata-tahoe-*; do \
-	 flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; \
-	done
+	@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
 
 # DEBIAN PACKAGING
 
-- 
2.45.2