[Pkg-voip-commits] [SCM] UNNAMED PROJECT branch, master, updated. upstream/1.8.0_pre1-12-g6eb74a5

[Daniel Pocock]

The following commit has been merged in the master branch:
commit d31225a5f55812d8a550c3ac6173a944bd438396
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Sun May 20 18:53:01 2012 +0200

    Stop sourcing /etc/default/... during postinst

diff --git a/debian/repro.postinst b/debian/repro.postinst
index e6d556f..288d230 100644
--- a/debian/repro.postinst
+++ b/debian/repro.postinst
@@ -19,17 +19,13 @@ set -e
 # $1 = version of the package being upgraded.
 install() {
 
-    if [ -f /etc/default/repro ]; then
-        . /etc/default/repro || true
-    fi
-
-    REPRO_GROUP=${REPRO_GROUP:-repro}
+    REPRO_GROUP=repro
     if ! getent group "$REPRO_GROUP" >/dev/null; then
         addgroup --system "$REPRO_GROUP" || exit 1
     fi
 
-    REPRO_HOME=${REPRO_HOME:-/var/lib/repro}
-    REPRO_USER=${REPRO_USER:-repro}
+    REPRO_HOME=/var/lib/repro
+    REPRO_USER=repro
     if ! getent passwd "$REPRO_USER" >/dev/null; then
         adduser --system \
            --home "${REPRO_HOME}" \
diff --git a/debian/resiprocate-turn-server.postinst b/debian/resiprocate-turn-server.postinst
index 20bf925..f8857cd 100644
--- a/debian/resiprocate-turn-server.postinst
+++ b/debian/resiprocate-turn-server.postinst
@@ -17,16 +17,12 @@ set -e
 # $1 = version of the package being upgraded.
 install() {
 
-    if [ -f /etc/default/resiprocate-turn-server ]; then
-        . /etc/default/resiprocate-turn-server || true
-    fi
-
-    RETURN_GROUP=${RETURN_GROUP:-return}
+    RETURN_GROUP=return
     if ! getent group "$RETURN_GROUP" >/dev/null; then
         addgroup --system "$RETURN_GROUP" || exit 1
     fi
 
-    RETURN_USER=${RETURN_USER:-return}
+    RETURN_USER=return
     if ! getent passwd "$RETURN_USER" >/dev/null; then
         adduser --system \
            --home / \

-- 
UNNAMED PROJECT