From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 15 Dec 2012 23:58:22 +0000 (+0000)
Subject: Conditional upgrade checks (setting L&B server without logger).
X-Git-Tag: merge_32_head_take_5_dst~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a8c8724406d1da587f3adbcd6975d4ab0f08d09b;p=jra1mw.git

Conditional upgrade checks (setting L&B server without logger).
---

diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup
index 4171608..5ae4f25 100755
--- a/org.glite.lb.server/config/setup
+++ b/org.glite.lb.server/config/setup
@@ -593,7 +593,7 @@ fi
 if test "$setup_upgrade_logger" = "1"; then
 	# upgrade from L&B <= 4.0.1
 	rm -f /tmp/interlogger.sock
-	if test -d /var/glite/log; then
+	if test -d /var/glite/log -a -d /var/spool/glite/lb-locallogger; then
 		find /var/glite/log -type f -name dglogd.log.\* -exec mv {} /var/spool/glite/lb-locallogger \;
 	fi
 fi
@@ -601,13 +601,17 @@ fi
 if test "$setup_upgrade_notif" = "1"; then
 	# upgrade from L&B <= 4.0.1
 	rm -f /tmp/glite-lb-notif.sock
-	find /var/tmp -type f -name glite-lb-notif.\* -exec mv {} /var/spool/lb-notif \;
+	if test -d /var/spool/lb-notif; then
+		find /var/tmp -type f -name glite-lb-notif.\* -exec mv {} /var/spool/lb-notif \;
+	fi
 fi
 
 if test "$setup_upgrade_proxy" = "1"; then
 	# upgrade from L&B <= 4.0.1
 	rm -f /tmp/glite-lbproxy-ilog.sock
-	find /tmp -type f -name glite-lbproxy-ilog_events.\* -exec mv {} /var/spool/lb-proxy \;
+	if test -d /var/spool/lb-proxy; then
+		find /tmp -type f -name glite-lbproxy-ilog_events.\* -exec mv {} /var/spool/lb-proxy \;
+	fi
 fi
 
 # ==== fetch CRL ====