Merge lp:~smoser/glance/ubuntu-chown-trailing-slash into lp:~openstack-ubuntu-packagers/glance/ubuntu

[Scott Moser]

This fixes the case where the user would do something like this:
sudo mkdir -p /opt/lib/glance
sudo ln -s /opt/lib/glance /var/lib/glance

sudo apt-get install glance

Generally, if you expect for a thing to be a directory, it makes sense to use the trailing / to chown.

[Thierry Carrez (ttx)]

Looks good, merging

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-16 19:17:28 +0000
+++ debian/changelog	2011-08-17 01:00:26 +0000
@@ -3,6 +3,9 @@
   * New upstream release.
   * Added python-kombu as Depends and Build-depends.
 
+  [ Scott Moser ]
+  * glance.postinst: use a trailing slash when using chown on directories
+
  -- Monty Taylor <[e-mail]>  Fri, 12 Aug 2011 12:53:06 -0400
 
 glance (2011.3~d4~20110811.980-0ubuntu1) oneiric; urgency=low

=== modified file 'debian/glance.postinst'
--- debian/glance.postinst	2011-05-10 17:37:39 +0000
+++ debian/glance.postinst	2011-08-17 01:00:26 +0000
@@ -8,7 +8,7 @@
 	then
         adduser --system --home /var/lib/glance --no-create-home --shell /bin/bash glance
 	fi
-	chown glance -R /var/lib/glance /var/log/glance
+	chown 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