Index: /trunk/packages/invirt-database/debian/changelog
===================================================================
--- /trunk/packages/invirt-database/debian/changelog	(revision 2780)
+++ /trunk/packages/invirt-database/debian/changelog	(revision 2781)
@@ -1,2 +1,8 @@
+invirt-database (0.2.3) unstable; urgency=low
+
+  * Test whether invirt user exists in postinst
+
+ -- Greg Brockman <gdb@mit.edu>  Thu, 24 Dec 2009 18:58:32 -0500
+
 invirt-database (0.2.2) unstable; urgency=low
 
Index: /trunk/packages/invirt-database/debian/invirt-database-server.postinst
===================================================================
--- /trunk/packages/invirt-database/debian/invirt-database-server.postinst	(revision 2780)
+++ /trunk/packages/invirt-database/debian/invirt-database-server.postinst	(revision 2781)
@@ -29,4 +29,5 @@
 case "$1" in
     configure)
+	echo "$2"
         #Don't create users on upgrade
         if [ -z "$2" ]; then
@@ -34,6 +35,10 @@
             su postgres -c 'createuser invirt -S -d -R'    || true
             su postgres -c 'createdb invirt -O invirt'   || true
-            adduser --system invirt
         fi
+
+	# The invirt user *must* exist
+	if [ -z `getent passwd invirt` ]; then
+	    adduser --system invirt
+	fi
 	invoke-rc.d postgresql-8.3 restart
         su invirt -s /bin/sh -c 'invirt-database-tables create'