Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package wicd. Latest upload in sid fixes RC bug #692916.

Attaching diff to -3 (which was already unblocked recently).
I moved the code adding users from debconf's .config to postinst; adduser was
already a dependency of wicd-daemon.
Also, I changed the call to getent to be a bit clearer (thanks to Vagrant on
IRC).

unblock wicd/1.7.2.4-4

Thanks!
David

-- 
 . ''`.   Debian developer | http://wiki.debian.org/DavidPaleino
 : :'  : Linuxer #334216 --|-- http://www.hanskalabs.net/
 `. `'`  GPG: 1392B174 ----|---- http://deb.li/dapal
   `-   2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174
diff --git a/debian/changelog b/debian/changelog
index fdfb349..1e0c95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wicd (1.7.2.4-4) unstable; urgency=low
+
+  * Move user-adding code from debconf-config to wicd-daemon postinst
+    (Closes: #692916)
+
+ -- David Paleino <da...@debian.org>  Sat, 10 Nov 2012 21:41:50 +0100
+
 wicd (1.7.2.4-3) unstable; urgency=low
 
   * Fix debian/watch
diff --git a/debian/wicd-daemon.config b/debian/wicd-daemon.config
index 1622e51..d4c4e16 100755
--- a/debian/wicd-daemon.config
+++ b/debian/wicd-daemon.config
@@ -25,14 +25,3 @@ db_subst wicd/users users "$users"
 
 db_input high wicd/users || true
 db_go
-
-db_get wicd/users
-users=$(echo $RET | sed -e 's@,@@g')
-
-# Add selected users
-for u in $users; do
-	hasuser=$((getent passwd | grep -w $u) || true)
-	if [ -n "$hasuser" ]; then
-		adduser --quiet $u netdev
-	fi
-done
diff --git a/debian/wicd-daemon.postinst b/debian/wicd-daemon.postinst
index 17451fd..2aa4eec 100644
--- a/debian/wicd-daemon.postinst
+++ b/debian/wicd-daemon.postinst
@@ -37,6 +37,16 @@ case "$1" in
                 fi
             fi
         fi
+
+        # Add users previously selected in debconf
+        db_get wicd/users
+        users=$(echo $RET | sed -e 's@,@@g')
+        for u in $users; do
+            hasuser=$(getent passwd $u || true)
+            if [ -n "$hasuser" ]; then
+                adduser --quiet $u netdev
+            fi
+        done
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Attachment: signature.asc
Description: PGP signature

Reply via email to