[DRE-commits] [gitlab] 23/23: echos should go after debconf init

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab.

commit 7631d53536f1799d49c90d98f680d014af140a9b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jun 3 18:10:06 2016 +0530

    echos should go after debconf init
---
 debian/postrm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/postrm b/debian/postrm
index 4950efc..3d913aa 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -15,13 +15,6 @@ set -e
 
 # Read and export debian specific configuration
 # Only exported variables will be passed on to gitlab app
-echo "Reading gitlab-debian.conf..."
-gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
-test -f ${gitlab_debian_conf} && export $(cat ${gitlab_debian_conf})
-nginx_site="/etc/nginx/sites-available/${GITLAB_HOST}"
-
-test -f ${nginx_site} && echo "Found nginx site configuration at ${nginx_site}..."
-
 case "$1" in
   remove)
     # This package is being removed, but its configuration has not yet
@@ -37,6 +30,21 @@ case "$1" in
     # This package has previously been removed and is now having
     # its configuration purged from the system.
     :
+    # purge debconf questions
+    if [ -e /usr/share/debconf/confmodule ]; then
+      # Source debconf library.
+      . /usr/share/debconf/confmodule
+      # Remove my changes to the db.
+      db_purge
+    fi
+
+    echo "Reading gitlab-debian.conf..."
+    gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
+    test -f ${gitlab_debian_conf} && export $(cat ${gitlab_debian_conf})
+    nginx_site="/etc/nginx/sites-available/${GITLAB_HOST}"
+
+    test -f ${nginx_site} && echo "Found nginx site configuration at ${nginx_site}..."
+
 
     # we mimic dpkg as closely as possible, so we remove configuration
     # files with dpkg backup extensions too:
@@ -64,15 +72,7 @@ case "$1" in
       test -n "${gitlab_yml}" && ucfr --purge gitlab ${gitlab_yml}
     fi
 
-    # purge debconf questions
-    if [ -e /usr/share/debconf/confmodule ]; then
-      # Source debconf library.
-      . /usr/share/debconf/confmodule
-      # Remove my changes to the db.
-      db_purge
-    fi
-
-    # cleanup complete
+       # cleanup complete
     exit 0
 
     ;;

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