Glance

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

  1. merge-from-ubuntu
  2. Merge into ubuntu
Proposed by Scott Moser
Status: Merged
Merged at revision: 73
Proposed branch: lp:~smoser/glance/merge-from-ubuntu
Merge into: lp:~openstack-ubuntu-packagers/glance/ubuntu
Diff against target: 60 lines (+22/-3)
3 files modified
debian/changelog (+11/-0)
debian/glance.postinst (+6/-2)
debian/glance.postrm (+5/-1)
To merge this branch: bzr merge lp:~smoser/glance/merge-from-ubuntu
Reviewer Review Type Date Requested Status
Chuck Short (community) Approve
Review via email: mp+77190@code.launchpad.net

Description of the change

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)

To post a comment you must log in.
lp:~smoser/glance/merge-from-ubuntu updated
70. By Scott Moser

merge from current packaging branch

Revision history for this message
Chuck Short (zulcss) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1glance (2012.1~e1~20110919.1021-0ubuntu2) UNRELEASED; urgency=low
2
3 [ Chuck Short ]
4 * debian/glance.postinst: Add glance group and add glance user to it.
5 (LP: #851860)
6
7 [ Adam Gandelman ]
8 * Only remove user/group in .postrm if they exist. (LP: #857021)
9
10 -- Scott Moser <smoser@ubuntu.com> Wed, 07 Dec 2011 14:10:28 -0500
11
1glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low12glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low
213
3 * New upstream release14 * New upstream release
415
=== 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 @@
44
5if [ "$1" = "configure" ]5if [ "$1" = "configure" ]
6then6then
7 if ! getent group glance > /dev/null 2>&1
8 then
9 addgroup --system glance >/dev/null
10 fi
7 if ! getent passwd glance > /dev/null 2>&111 if ! getent passwd glance > /dev/null 2>&1
8 then12 then
9 adduser --system --home /var/lib/glance --no-create-home --shell /bin/bash glance13 adduser --system --home /var/lib/glance --ingroup glance --no-create-home --shell /bin/bash glance
10 fi14 fi
11 chown glance -R /var/lib/glance/ /var/log/glance/15 chown glance:glance -R /var/lib/glance/ /var/log/glance/
12 if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"16 if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
13 then17 then
14 su -c 'glance-manage db_sync' glance18 su -c 'glance-manage db_sync' glance
1519
=== 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 @@
6 purge)6 purge)
7 echo "Purging glance. Backup of /var/lib/glance can be found at /var/lib/glance.tar.bz2" 7 echo "Purging glance. Backup of /var/lib/glance can be found at /var/lib/glance.tar.bz2"
88
9 if which deluser > /dev/null 2>&1; then9 if (which deluser && getent passwd glance) > /dev/null 2>&1; then
10 deluser --system --quiet --backup-to /var/lib glance10 deluser --system --quiet --backup-to /var/lib glance
11 fi 11 fi
1212
13 if (which delgroup && getent group glance) > /dev/null 2>&1; then
14 delgroup --system --quiet glance
15 fi
16
13 [ -e /var/lib/glance ] && rm -rf /var/lib/glance17 [ -e /var/lib/glance ] && rm -rf /var/lib/glance
14 [ -e /var/log/glance ] && rm -rf /var/log/glance18 [ -e /var/log/glance ] && rm -rf /var/log/glance
15 ;;19 ;;

Subscribers

People subscribed via source and target branches