From: Felix Dörre <felix@dogcraft.de>
Date: Mon, 29 Aug 2016 11:32:35 +0000 (+0200)
Subject: Merge "fix: only run fetch-locales in postinst configure"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=08e0b5673b6994fc692a578f1ff99ebb67ae2410;hp=6d1b746247f6e1eab7d1da17112beb9cf5abb089

Merge "fix: only run fetch-locales in postinst configure"
---

diff --git a/debian/cacert-gigi-testing.postinst b/debian/cacert-gigi-testing.postinst
index 46fcf81d..6ed6758d 100644
--- a/debian/cacert-gigi-testing.postinst
+++ b/debian/cacert-gigi-testing.postinst
@@ -20,6 +20,13 @@ set -e
 
 case "$1" in
     configure)
+        if [ -f /usr/share/debconf/confmodule ]; then
+            . /usr/share/debconf/confmodule
+            db_get cacert-gigi-testing/fetch-locales-command
+            $RET
+        else
+            gigi fetch-locales
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -31,15 +38,6 @@ case "$1" in
     ;;
 esac
 
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-    db_get cacert-gigi-testing/fetch-locales-command
-    $RET
-else
-    gigi fetch-locales
-fi
-
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/debian/cacert-gigi.postinst b/debian/cacert-gigi.postinst
index d2970c11..d2882e44 100644
--- a/debian/cacert-gigi.postinst
+++ b/debian/cacert-gigi.postinst
@@ -20,6 +20,13 @@ set -e
 
 case "$1" in
     configure)
+        if [ -f /usr/share/debconf/confmodule ]; then
+            . /usr/share/debconf/confmodule
+            db_get cacert-gigi/fetch-locales-command
+            $RET
+        else
+            gigi fetch-locales
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -31,14 +38,6 @@ case "$1" in
     ;;
 esac
 
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-    db_get cacert-gigi/fetch-locales-command
-    $RET
-else
-    gigi fetch-locales
-fi
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.