[DRE-commits] [redmine] 25/39: config: fix debconf usage

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit 27bd3cd84bea0bdf6570c44b7c6ab32962b16c63
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Sep 28 18:23:21 2015 -0300

    config: fix debconf usage
---
 debian/config | 54 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/debian/config b/debian/config
index fad70ce..6e012ef 100644
--- a/debian/config
+++ b/debian/config
@@ -13,34 +13,36 @@ if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
   original_instances="$RET"
 
   db_input medium redmine/current-instances || true
-  db_go
-  current_instances="$RET"
-  if [ -z "$current_instances" ]; then
-    current_instances='default'
-  fi
+  if db_go; then
+    db_get redmine/current-instances || true
+    current_instances="$RET"
+    if [ -z "$current_instances" ]; then
+      current_instances='default'
+    fi
+
+    for inst in $current_instances; do
+      dbc_go redmine/instances/$inst "$@"
+      # TODO call redmine-instances to create filesystem
+      # TODO handle language for initial db data
+    done
 
-  for inst in $current_instances; do
-    dbc_go redmine/instances/$inst "$@"
-
-    # TODO handle language for initial db data
-  done
-
-  # determine which instances were removed and store in redmine/old-instances
-  removed_instances=""
-  separator=""
-  for orig in $original_instances; do
-    removed='true'
-    for curr in $current_instances; do
-      if [ "$orig" = "$curr" ]; then
-        removed='false'
-        break
+    # determine which instances were removed and store in redmine/old-instances
+    removed_instances=""
+    separator=""
+    for orig in $original_instances; do
+      removed='true'
+      for curr in $current_instances; do
+        if [ "$orig" = "$curr" ]; then
+          removed='false'
+          break
+        fi
+      done
+      if [ "$removed" = 'true' ]; then
+        removed_instances="${separator}$removed_instances"
+        separator=" "
       fi
     done
-    if [ "$removed" = 'true' ]; then
-      removed_instances="${separator}$removed_instances"
-      separator=" "
-    fi
-  done
-  db_set redmine/old-instances "$removed_instances"
+    db_set redmine/old-instances "$removed_instances"
+  fi
 
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git