[pkg-eucalyptus-commits] r260 - eucalyptus/trunk/debian

[Brian Thomason]

Author: iamfuzz-guest
Date: 2012-07-30 20:39:12 +0000 (Mon, 30 Jul 2012)
New Revision: 260

Removed:
   eucalyptus/trunk/debian/eucalyptus-common.preinst
Modified:
   eucalyptus/trunk/debian/eucalyptus-common.postinst
   eucalyptus/trunk/debian/eucalyptus-java-common.postinst
Log:
Remove dupgrade code


Modified: eucalyptus/trunk/debian/eucalyptus-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.postinst	2012-07-27 12:40:40 UTC (rev 259)
+++ eucalyptus/trunk/debian/eucalyptus-common.postinst	2012-07-30 20:39:12 UTC (rev 260)
@@ -10,29 +10,6 @@
     	if [ -z "$2" ]; then
         # first install
         euca_conf -d / --user eucalyptus --bridge br0 --hypervisor kvm --instances /var/lib/eucalyptus/instances --dhcpd /usr/sbin/dhcpd3 --dhcp_user dhcpd || true
-
-	elif dpkg --compare-versions "$2" lt "3.1~"; then
-	# an upgrade
-
-    	# let's check if we have a dist file
-	    if [ -e /etc/eucalyptus/eucalyptus.conf.dpkg-dist ];
-	    then
-		if grep VNET_PUBINTERFACE /etc/eucalyptus/eucalyptus.conf.dpkg-dist > /dev/null ;
-		then
-		# we prefer the new conf file and we saved
-		# a copy of the original one
-		    cp -f /etc/eucalyptus/eucalyptus.conf.dpkg-dist /etc/eucalyptus/eucalyptus.conf
-		fi
-	    fi
-	    if [ -f /tmp/eucaback.dir ]; then
-		BACKDIR=`cat /tmp/eucaback.dir`
-		if [ -d "$BACKDIR" ]; then
-		    /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --conf  >>/var/log/eucalyptus/upgrade.log 2>&1 || true
-		fi
-	    fi
-	    OLD_EUCA_VERSION="$2"
-	    echo "# This file was automatically generated by Eucalyptus packaging." > /etc/eucalyptus/.upgrade
-	    echo "$OLD_EUCA_VERSION:$BACKDIR" >> /etc/eucalyptus/.upgrade
 	fi
 fi
 

Deleted: eucalyptus/trunk/debian/eucalyptus-common.preinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.preinst	2012-07-27 12:40:40 UTC (rev 259)
+++ eucalyptus/trunk/debian/eucalyptus-common.preinst	2012-07-30 20:39:12 UTC (rev 260)
@@ -1,30 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "upgrade" ];
-then
-	if dpkg --compare-versions "$2" lt "3.1~"
-	then
-		cp -a /etc/eucalyptus/eucalyptus.conf /etc/eucalyptus/eucalyptus.conf.old
-		CWD=`pwd`
-		DATESTR=`date +%s`
-		UPGRDIR=/var/lib/eucalyptus/upgrade
-		echo ${UPGRDIR}/eucalyptus.backup.$DATESTR > /tmp/eucaback.dir
-
-		rm -rf ${UPGRDIR}/eucalyptus.backup.$DATESTR
-		mkdir -p -m 700 ${UPGRDIR}/eucalyptus.backup.$DATESTR
-		chown eucalyptus:eucalyptus ${UPGRDIR}/eucalyptus.backup.$DATESTR
-
-		cd ${UPGRDIR}/eucalyptus.backup.$DATESTR
-		EUCABACKUPS=""
-		for i in $EUCADIR/var/lib/eucalyptus/keys/ $EUCADIR/var/lib/eucalyptus/db/ $EUCADIR/var/lib/eucalyptus/services $EUCADIR/etc/eucalyptus/eucalyptus.conf $EUCADIR/etc/eucalyptus/eucalyptus-version $EUCADIR/usr/share/eucalyptus/
-		do
-		    if [ -e $i ]; then
-			EUCABACKUPS="$EUCABACKUPS $i"
-		    fi
-		done
-		tar cf -  $EUCABACKUPS 2>/dev/null | tar xf - 2>/dev/null
-		cd $CWD
-	fi
-fi
-
-#DEBHELPER#

Modified: eucalyptus/trunk/debian/eucalyptus-java-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.postinst	2012-07-27 12:40:40 UTC (rev 259)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.postinst	2012-07-30 20:39:12 UTC (rev 260)
@@ -9,21 +9,6 @@
   else
     /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
   fi
-
-  if dpkg --compare-versions "$2" lt "3.0~"; then
-      if [ -f /tmp/eucaback.dir ]; then
-	  BACKDIR=`cat /tmp/eucaback.dir`
-	  if [ -d "$BACKDIR" ]; then
-              if [ -f "$BACKDIR/etc/eucalyptus/eucalyptus-version" -a -f "/etc/eucalyptus/eucalyptus-version" ]; then
-		  export OLDVERSION=`cat $BACKDIR/etc/eucalyptus/eucalyptus-version`
-		  export NEWVERSION=`cat /etc/eucalyptus/eucalyptus-version`
-		  if [ "$OLDVERSION" != "$NEWVERSION" ]; then
-                      rm -f /usr/share/eucalyptus/eucalyptus-*$OLDVERSION*.jar
-		  fi
-              fi
-	  fi
-      fi
-  fi
 fi
 
 #DEBHELPER#