From b99dee33a549fcc742e9ac9c914e9d7e63e43fe5 Mon Sep 17 00:00:00 2001
From: Eric Price <ecprice@mit.edu>
Date: Fri, 28 Mar 2008 21:14:40 -0400
Subject: [PATCH] Improve postinst script to not give errors.

svn path=/trunk/packages/sipb-xen-database/sipb-xen-database/; revision=295
---
 debian/sipb-xen-database-server.postinst |   12 +++++++-----
 debian/sipb-xen-database-server.prerm    |    4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/sipb-xen-database-server.postinst b/debian/sipb-xen-database-server.postinst
index 9d14353..3f01ee6 100644
--- a/debian/sipb-xen-database-server.postinst
+++ b/debian/sipb-xen-database-server.postinst
@@ -20,11 +20,13 @@ set -e
 
 case "$1" in
     configure)
-        # Don't fail if the user/database already exists
-        su postgres -c 'createuser sipb-xen -S -d -R'    || true
-        su postgres -c 'createdb sipb_xen -O sipb-xen'   || true
-        adduser --system sipb-xen
-
+        #Don't create users on upgrade
+        if [ -z "$2" ]; then
+            # Don't fail if the user/database already exists
+            su postgres -c 'createuser sipb-xen -S -d -R'    || true
+            su postgres -c 'createdb sipb_xen -O sipb-xen'   || true
+            adduser --system sipb-xen
+        fi
         su sipb-xen -s /bin/sh -c 'sipb-xen-database-tables create'
     ;;
 
diff --git a/debian/sipb-xen-database-server.prerm b/debian/sipb-xen-database-server.prerm
index 40489f9..c3d7506 100644
--- a/debian/sipb-xen-database-server.prerm
+++ b/debian/sipb-xen-database-server.prerm
@@ -18,7 +18,7 @@ set -e
 
 
 case "$1" in
-    remove|upgrade|deconfigure)
+    remove|deconfigure)
 
         # This will destroy data -- do we want to do this?
         # su postgres -c 'dropdb sipb_xen'
@@ -26,7 +26,7 @@ case "$1" in
         deluser sipb-xen
     ;;
 
-    failed-upgrade)
+    upgrade|failed-upgrade)
     ;;
 
     *)
-- 
1.7.9.5