setup: in the Makefile, refuse to upload tarballs unless someone has passed the envir...

diff --git a/Makefile b/Makefile
index 0bd474b7322a223ee85258d7609b0c8f0357afd2..3e4be601d07085ce0be9c1ffe298faaa8a3d59b1 100644 (file)
--- 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