Ubuntu
glance package

Merge lp:~gandelman-a/ubuntu/oneiric/glance/lp857021 into lp:ubuntu/oneiric/glance

  1. Oneiric (11.10)
  2. lp857021
  3. Merge into oneiric
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 19
Proposed branch: lp:~gandelman-a/ubuntu/oneiric/glance/lp857021
Merge into: lp:ubuntu/oneiric/glance
Diff against target: 45 lines (+11/-3)
3 files modified
debian/changelog (+7/-0)
debian/glance.postinst (+2/-1)
debian/glance.postrm (+2/-2)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/oneiric/glance/lp857021
Reviewer Review Type Date Requested Status
Dave Walker (community) Approve
Ubuntu branches Pending
Review via email: mp+76670@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Gandelman (gandelman-a) wrote :

fixes trivial syntax error in glance.postinst

Revision history for this message
Dave Walker (davewalker) wrote :

Uploaded, currently in unapproved queue.

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-22 10:45:33 +0000
3+++ debian/changelog 2011-09-23 05:10:27 +0000
4@@ -1,3 +1,10 @@
5+glance (2011.3-0ubuntu2) oneiric; urgency=low
6+
7+ * debian/glance.{postinst,postrm}: Fix syntax error, /dev/null redirect
8+ typos. Only remove user/group in .postrm if they exist. (LP: #857021)
9+
10+ -- Adam Gandelman <adamg@canonical.com> Thu, 22 Sep 2011 21:03:26 -0700
11+
12 glance (2011.3-0ubuntu1) oneiric; urgency=low
13
14 * New upstream release.
15
16=== modified file 'debian/glance.postinst'
17--- debian/glance.postinst 2011-09-22 10:45:33 +0000
18+++ debian/glance.postinst 2011-09-23 05:10:27 +0000
19@@ -5,7 +5,8 @@
20 if [ "$1" = "configure" ]
21 then
22 if ! getent group glance > /dev/null 2>&1
23- addgroup --system glance >/dev/nul
24+ then
25+ addgroup --system glance >/dev/null
26 fi
27 if ! getent passwd glance > /dev/null 2>&1
28 then
29
30=== modified file 'debian/glance.postrm'
31--- debian/glance.postrm 2011-09-22 10:45:33 +0000
32+++ debian/glance.postrm 2011-09-23 05:10:27 +0000
33@@ -6,11 +6,11 @@
34 purge)
35 echo "Purging glance. Backup of /var/lib/glance can be found at /var/lib/glance.tar.bz2"
36
37- if which deluser > /dev/null 2>&1; then
38+ if (which deluser && getent passwd glance) > /dev/null 2>&1; then
39 deluser --system --quiet --backup-to /var/lib glance
40 fi
41
42- if which delgroup > /dev/nul 2>&1; then
43+ if (which delgroup && getent group glance) > /dev/null 2>&1; then
44 delgroup --system --quiet glance
45 fi
46

Subscribers

People subscribed via source and target branches