From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 18 Dec 2012 17:50:30 +0000 (-0500)
Subject: Merge remote branch 'alioth/master' into enh/wheezy-vm
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=585d2e26c6346432d4e3714ab678d4d52c777259;hp=2fdac85ca3cd1d0f74035ee6a999bb129ef4e14d;p=neurodebian.git

Merge remote branch 'alioth/master' into enh/wheezy-vm

* alioth/master:
  BF: move -u in nd_build down so we get sensible help
  exclude debian-devel from being wipedout upon upload-website
---

diff --git a/Makefile b/Makefile
index f2876a1..8aa19e3 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ build/db.db:
 
 upload-website: html
 	rsync -rvzlhp --delete \
-        --exclude=debian --exclude=debian-local --exclude=_files \
+        --exclude=debian --exclude=debian-local --exclude=debian-devel --exclude=_files \
         --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
 	: # Touch stamp here so we get it updated on every upload
 	touch $@-stamp
diff --git a/tools/nd_backport b/tools/nd_backport
index b71fe5d..b91b54a 100755
--- a/tools/nd_backport
+++ b/tools/nd_backport
@@ -4,7 +4,6 @@
 #
 
 set -e
-set -u
 
 release=$1
 dscfile=$2
@@ -27,6 +26,8 @@ EOT
 exit 1
 fi
 
+set -u
+
 upstream_name=${dscfile%%_*}
 
 # To overcome bash desire to claim empty array unbound under 'set -u'