[MERGE] merge with latest stable

[odoo/odoo.git] / debian / openerp-server.postrm

diff --git a/debian/openerp-server.postrm b/debian/openerp-server.postrm
index e9effaa..02b3d0a 100644 (file)
--- a/debian/openerp-server.postrm
+++ b/debian/openerp-server.postrm
@@ -2,31 +2,10 @@
 
 set -e
 
-if [ -e /usr/share/debconf/confmodule ]
-then
-       _DEBCONF="true"
-
-       . /usr/share/debconf/confmodule
-fi
-
 case "${1}" in
        remove)
-               if [ "${_DEBCONF}" = "true"  ]
-               then
-                       db_version 2.0
-
-                       db_get openerp-server/username
-                       _USERNAME="${RET}"
-
-                       db_stop
-               fi
-
-               if [ -z "${_USERNAME}" ]
-               then
-                       _USERNAME="openerp"
-               fi
-
-               _GROUPNAME="${_USERNAME}"
+               _USERNAME="openerp"
+               _GROUPNAME="openerp"
 
                if [ -x /usr/sbin/deluser ]
                then
@@ -39,11 +18,15 @@ case "${1}" in
                fi
 
                rm -f /usr/lib/openerp-server/addons/__init__.pyc
-               rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server/addons
-               rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server
+               rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server/addons || true
+               rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server || true
+               ;;
+
+       purge)
+               rm -rf /var/lib/openerp-server
                ;;
 
-       purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+       upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 
                ;;