From 156714c74c481b2802b0d63feea3191b4263f7e4 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 7 Aug 2006 21:56:00 +0000
Subject: [PATCH] - don't merge and remove .rpmsave in %post since that defeats
 the   purpose of what we're trying to do (preserve files that will be  
 deleted during an upgrade)

---
 myplc.spec | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/myplc.spec b/myplc.spec
index 1d8cc62..b10441b 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -124,9 +124,11 @@ fi
 # 0 = install, 1 = upgrade
 if [ $1 -gt 0 ] ; then
     for dir in /var/lib/pgsql/data /etc/planetlab ; do
-	if [ -d /plc/data/$dir -a ! -d /plc/data/$dir.rpmsave ] ; then
+	if [ -d /plc/data/$dir ] ; then
 	    echo "Preserving /plc/data/$dir"
-	    cp -ra /plc/data/$dir{,.rpmsave}
+	    mkdir -p /plc/data/$dir.rpmsave
+	    tar -C /plc/data/$dir -cpf - . | \
+	       tar -C /plc/data/$dir.rpmsave -xpf -
 	fi
     done
 fi
@@ -137,16 +139,6 @@ if [ -x /sbin/chkconfig ] ; then
     /sbin/chkconfig plc on
 fi
 
-for dir in /var/lib/pgsql/data /etc/planetlab ; do
-    if [ -d /plc/data/$dir.rpmsave -a -d /plc/data/$dir ] ; then
-	echo "Merging /plc/data/$dir"
-	if tar -C /plc/data/$dir.rpmsave -cpf - . | \
-	    tar -C /plc/data/$dir -xpf - ; then
-	    rm -rf /plc/data/$dir.rpmsave
-	fi
-    fi
-done
-
 # Force a regeneration to take into account new variables
 touch /plc/data/etc/planetlab/default_config.xml
 
-- 
2.45.2