Sun Nov 20 23:24:26 GMT 2011 david-sarah@jacaranda.org

  * Use a private/drop_upload_dircap file instead of the [drop_upload]upload.dircap option in tahoe.cfg. Fail if the upload.dircap option is used, or options are missing. Also updates tests and docs. fixes #1593

diff --git a/Makefile b/Makefile
index ba83cdbd8224e7c3973284e8ab463d11b83ba5ef..1134e47d57a8a1742771e12c62dfb41523472bfe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,10 @@ test-darcs-boringfile:
        $(MAKE)
        $(PYTHON) misc/build_helpers/test-darcs-boringfile.py
 
+test-git-ignore:
+       $(MAKE)
+       $(PYTHON) misc/build_helpers/test-git-ignore.py
+
 test-clean:
        find . |grep -vEe "_darcs|allfiles.tmp|src/allmydata/_(version|appname).py" |sort >allfiles.tmp.old
        $(MAKE)

diff --git a/misc/build_helpers/test-git-ignore.py b/misc/build_helpers/test-git-ignore.py
new file mode 100644 (file)
index 0000000..832f775
--- /dev/null
+++ b/misc/build_helpers/test-git-ignore.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+import sys
+from subprocess import Popen, PIPE
+
+cmd = ["git", "status", "--porcelain"]
+p = Popen(cmd, stdout=PIPE)
+output = p.communicate()[0]
+print output
+if output == "":
+    sys.exit(0)
+sys.exit(1)
+
+