From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 30 May 2009 12:31:04 +0000 (+0200)
Subject: various shell scripts
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd5aa4f7f7399147e421f5f5f6ca601c073d5fba;p=dak

various shell scripts

make them set -E so they honor the errtrap even in functions

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 838955c2..9a21ae8b 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -20,6 +20,10 @@
 set -e
 # make sure to only use defined variables
 set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 
 # import the general variable set.
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
diff --git a/config/debian/cron.reboot b/config/debian/cron.reboot
index b3c0b09a..865efcbe 100755
--- a/config/debian/cron.reboot
+++ b/config/debian/cron.reboot
@@ -20,6 +20,10 @@
 set -e
 # make sure to only use defined variables
 set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 
 # import the general variable set.
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 166579db..b3c078e3 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -20,6 +20,10 @@
 set -e
 # make sure to only use defined variables
 set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 
 # import the general variable set.
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 4baaf46c..5ab9d8b8 100755
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -4,6 +4,10 @@
 
 set -e
 set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS