[interchange-cvs] interchange - racke modified 2 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Fri Apr 4 12:03:42 2003


User:      racke
Date:      2003-04-04 17:00:48 GMT
Modified:  debian   interchange-cat-foundation.postinst
Modified:           interchange-cat-foundation.prerm
Log:
avoid installation error by checking installation state before
invoking interchange --add/--remove

Revision  Changes    Path
2.12      +5 -2      interchange/debian/interchange-cat-foundation.postinst


rev 2.12, prev_rev 2.11
Index: interchange-cat-foundation.postinst
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange-cat-foundation.postinst,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- interchange-cat-foundation.postinst	1 Jan 2003 20:45:53 -0000	2.11
+++ interchange-cat-foundation.postinst	4 Apr 2003 17:00:48 -0000	2.12
@@ -110,8 +110,11 @@
 if [ "$RET" = "true" ]; then
 	interchangeconfig USE_FOUNDATION=1
 
-	# add catalog to running server
-	echo 'Catalog foundation /var/lib/interchange/catalogs/foundation /cgi-bin/ic/foundation' | /usr/sbin/interchange --add foundation
+
+	if [ ! -f /var/run/interchange-install ]; then
+		# add catalog to running server
+		echo 'Catalog foundation /var/lib/interchange/catalogs/foundation /cgi-bin/ic/foundation' | /usr/sbin/interchange --add foundation
+	fi
 fi
 
 #DEBHELPER#



2.3       +4 -2      interchange/debian/interchange-cat-foundation.prerm


rev 2.3, prev_rev 2.2
Index: interchange-cat-foundation.prerm
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange-cat-foundation.prerm,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- interchange-cat-foundation.prerm	13 Aug 2001 20:08:02 -0000	2.2
+++ interchange-cat-foundation.prerm	4 Apr 2003 17:00:48 -0000	2.3
@@ -24,8 +24,10 @@
 
 db_get interchange-cat-foundation/install
 if [ "$RET" = "true" ]; then
-	# remove catalog from running server
-	/usr/sbin/interchange --remove=foundation
+	if [ ! -f /var/run/interchange-install ]; then
+		# remove catalog from running server
+		/usr/sbin/interchange --remove=foundation
+	fi
 fi
 
 #DEBHELPER#