[Pkg-corba-commits] r173 - /trunk/omniorb4/debian/omniorb-nameserver.postinst

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Wed May 28 20:58:40 2008
New Revision: 173

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=173
Log:
Simplify postinst, as upgrade from etch is hopeless anyway.  Should be
moved back to preinst really.

Modified:
    trunk/omniorb4/debian/omniorb-nameserver.postinst

Modified: trunk/omniorb4/debian/omniorb-nameserver.postinst
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb-nameserver.postinst?rev=173&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb-nameserver.postinst (original)
+++ trunk/omniorb4/debian/omniorb-nameserver.postinst Wed May 28 20:58:40 2008
@@ -5,30 +5,20 @@
 
 LIBDIR=/var/lib/omniorb/
 OLDLIBDIR=/var/lib/omniorb4/
-ETCHLIBDIR=/var/log/
 DBFILE=omninames-$(uname -n).log
 BAKFILE=omninames-$(uname -n).log
-
-
-# Check a *LIBDIR for $DBFILE and $BAKFILE, move them if it is safe.
-# $1 - *LIBDIR to check.
-maybe_move_db() {
-    if [ -f $1/$DBFILE -a ! -f $LIBDIR/$DBFILE ]; then
-        mv $1/$DBFILE $LIBDIR/$DBFILE
-    fi
-    if [ -f $1/$BAKFILE -a ! -f $LIBDIR/$BAKFILE ]; then
-        mv $1/$BAKFILE $LIBDIR/$BAKFILE
-    fi
-}
 
 
 case "$1" in
     configure)
         # Only move the DB if we haven't been installed before.
         if [ x$2 = x ]; then
-            maybe_move_db $ETCHLIBDIR
-            maybe_move_db $OLDLIBDIR
-            rmdir $OLDLIBDIR || /bin/true
+            test -f $OLDLIBDIR -a ! -f $LIBDIR/$DBFILE \
+                && mv $OLDLIBDIR/$DBFILE $LIBDIR/$DBFILE
+            test -f $OLDLIBDIR -a ! -f $LIBDIR/$BAKFILE \
+                && mv $OLDLIBDIR/$BAKFILE $LIBDIR/$BAKFILE
+            test -d $OLDLIBDIR \
+                && rmdir $OLDLIBDIR || /bin/true
         fi
         ;;
     abort-upgrade|abort-remove|abort-deconfigure)