[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.7-1-114-g8514fa4

[Andrew Pollock]

The following commit has been merged in the master branch:
commit ecdfe3478399613d7d3417240de79ef44936259b
Author: Andrew Pollock <apollock at dhcp-172-18-115-243.mtv.corp.google.com>
Date:   Wed May 27 23:40:06 2009 +0200

    Stop deleting users and groups to address #528068
    Apply a subset of the patch supplied by Stig Sandbeck Mathisen for #527381 to move creating the user to the postinst

diff --git a/debian/changelog b/debian/changelog
index 8e00bae..bee0e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-puppet (0.24.8-2) UNRELEASED; urgency=low
+puppet (0.24.8-2) UNRELEASED; urgency=high
 
   [ Micah Anderson ]
   * Cherry-pick upstream versioncmp fix (redmine:#2110)
@@ -7,10 +7,15 @@ puppet (0.24.8-2) UNRELEASED; urgency=low
   * Enable waiting for certificates for the default value (upstream default
     that was previously disabled or enabled with a 5 second value)
   * Re-ship the vim syntax file in the correct location (it fell out after the
-    0.24.5-3 upload)
+    0.24.5-3 upload) (closes: #530752)
   * Re-add the 0.24.5-3 changelog entry
+  * debian/puppet.postrm: don't delete the user or group (closes: #528068,
+    #527381)
+  * debian/puppet.{preinst,postinst}: Applied modified patch from Stig
+    Sandbeck Mathisen to call conditionally call adduser in the postinst, if
+    it's available
 
- -- Andrew Pollock <apollock at dhcp-172-18-115-243.mtv.corp.google.com>  Wed, 27 May 2009 23:21:01 +0200
+ -- Andrew Pollock <apollock at debian.org>  Wed, 27 May 2009 23:35:12 +0200
 
 puppet (0.24.8-1) unstable; urgency=low
 
diff --git a/debian/puppet.postinst b/debian/puppet.postinst
index ac765ba..e91a3ae 100644
--- a/debian/puppet.postinst
+++ b/debian/puppet.postinst
@@ -1,6 +1,11 @@
 #!/bin/sh -e
 
 if [ "$1" = "configure" ]; then
+	if ! getent passwd puppet > /dev/null; then
+		adduser --quiet --system --group --home /var/lib/puppet  \
+			--gecos "Puppet configuration management daemon" \
+			puppet
+	fi
 	if [ -d /etc/puppet/ssl ] && [ ! -e /var/lib/puppet/ssl ] && grep -q 'ssldir=/var/lib/puppet/ssl' /etc/puppet/puppet.conf; then
 		mv /etc/puppet/ssl /var/lib/puppet/ssl
 	fi
diff --git a/debian/puppet.postrm b/debian/puppet.postrm
index b1156cf..d4d6a7c 100644
--- a/debian/puppet.postrm
+++ b/debian/puppet.postrm
@@ -3,8 +3,6 @@
 case "$1" in
     purge)
 	rm -rf /var/lib/puppet
-	deluser --system puppet
-	delgroup --system puppet
 	rm -f /etc/puppet/puppetd.conf
 	;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/puppet.preinst b/debian/puppet.preinst
deleted file mode 100644
index 43ddc49..0000000
--- a/debian/puppet.preinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    install|upgrade)
-	adduser --system \
-	    --group \
-	    --home /var/lib/puppet \
-	    --gecos "Puppet configuration management daemon" \
-	    puppet > /dev/null
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-

-- 
Puppet packaging for Debian