[debian-edu-commits] debian-edu/pkg-team/ 03/08: debian/patches: Fix/improve 0011_evaluate-run-deploy-var.patch. Only exit silently, if RUN_DEPLOY is false and the evoking shell is non-interactive (e.g. CRON).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository ldap2zone.

commit da7f7cee96626ddf2c839a06f34ca02ef9318267
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 15 15:36:35 2016 +0100

    debian/patches: Fix/improve 0011_evaluate-run-deploy-var.patch. Only exit silently, if RUN_DEPLOY is false and the evoking shell is non-interactive (e.g. CRON).
---
 debian/patches/0011_evaluate-run-deploy-var.patch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0011_evaluate-run-deploy-var.patch b/debian/patches/0011_evaluate-run-deploy-var.patch
index 4e656bf..a1f5695 100644
--- a/debian/patches/0011_evaluate-run-deploy-var.patch
+++ b/debian/patches/0011_evaluate-run-deploy-var.patch
@@ -3,11 +3,12 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 --- a/ldap2bind
 +++ b/ldap2bind
-@@ -2,6 +2,10 @@
+@@ -2,6 +2,11 @@
  
  [ -r /etc/default/ldap2zone ] && . /etc/default/ldap2zone
  
-+if [ "$RUN_DEPLOY" != "false" ]; then
++# if shell is non-interactive (e.g. like when called via CRON) and RUN_DEPLOY is false, exit silently.
++if [ ! -t 1 ] && [ "$RUN_DEPLOY" = "false" ]; then
 +        exit 0
 +fi
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/ldap2zone.git