Merge lp:~smoser/glance/merge-from-ubuntu into lp:~openstack-ubuntu-packagers/glance/ubuntu

[Scott Moser]

pull in changes from Ubuntu's oneiric branch

This pulls in 2 bug fixes from Oneiric's 2011.3 branch.

  * debian/glance.postinst: Add glance group and add glance user to it.
    (LP: #851860)
  * Only remove user/group in .postrm if they exist. (LP: #857021)

[lp:~smoser/glance/merge-from-ubuntu]

70. By Scott Moser on 2011-12-07

merge from current packaging branch

[Chuck Short (zulcss)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-16 06:10:14 +0000
+++ debian/changelog	2011-12-07 19:18:25 +0000
@@ -1,3 +1,14 @@
+glance (2012.1~e1~20110919.1021-0ubuntu2) UNRELEASED; urgency=low
+
+  [ Chuck Short ]
+  * debian/glance.postinst: Add glance group and add glance user to it.
+    (LP: #851860)
+
+  [ Adam Gandelman ]
+  * Only remove user/group in .postrm if they exist. (LP: #857021)
+
+ -- Scott Moser <[e-mail]>  Wed, 07 Dec 2011 14:10:28 -0500
+
 glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/glance.postinst'
--- debian/glance.postinst	2011-08-11 11:50:38 +0000
+++ debian/glance.postinst	2011-12-07 19:18:25 +0000
@@ -4,11 +4,15 @@
 
 if [ "$1" = "configure" ]
 then
+	if ! getent group glance > /dev/null 2>&1
+	then
+		addgroup --system glance >/dev/null
+	fi
 	if ! getent passwd glance > /dev/null 2>&1
 	then
-        adduser --system --home /var/lib/glance --no-create-home --shell /bin/bash glance
+        adduser --system --home /var/lib/glance --ingroup glance --no-create-home --shell /bin/bash glance
 	fi
-	chown glance -R /var/lib/glance/ /var/log/glance/
+	chown glance:glance -R /var/lib/glance/ /var/log/glance/
 	if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
 	then
 		su -c 'glance-manage db_sync' glance

=== modified file 'debian/glance.postrm'
--- debian/glance.postrm	2011-08-24 19:55:31 +0000
+++ debian/glance.postrm	2011-12-07 19:18:25 +0000
@@ -6,10 +6,14 @@
 	purge)
 		echo "Purging glance. Backup of /var/lib/glance can be found at /var/lib/glance.tar.bz2"	
 
-		if which deluser > /dev/null 2>&1; then
+		if (which deluser && getent passwd glance) > /dev/null 2>&1; then
 			deluser --system --quiet --backup-to /var/lib glance
 		fi	
 
+		if (which delgroup && getent group glance) > /dev/null 2>&1; then
+			delgroup --system --quiet glance
+		fi
+
 		[ -e /var/lib/glance ] && rm -rf /var/lib/glance
 		[ -e /var/log/glance ] && rm -rf /var/log/glance
 		;;