[Xedeb-commits] jlbec commits r22 - in trunk: debian/server sources

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-02-07 18:49:17 -0600 (Tue, 07 Feb 2006)
New Revision: 22

Modified:
   trunk/debian/server/changelog
   trunk/debian/server/postrm
   trunk/debian/server/preinst
   trunk/sources/oracle-xe-10.2.0.1.tar.gz
   trunk/sources/oracle_server.spec
Log:

o Sync up to RC2



Modified: trunk/debian/server/changelog
===================================================================
--- trunk/debian/server/changelog	2006-02-07 23:19:51 UTC (rev 21)
+++ trunk/debian/server/changelog	2006-02-08 00:49:17 UTC (rev 22)
@@ -1,3 +1,9 @@
+oracle-xe (10.2.0.1-0.RC2) unstable; urgency=low
+
+  * Sync up to RC2. 
+
+ -- Joel Becker <joel.becker at oracle.com>  Tue,  7 Feb 2006 15:38:22 -0800
+
 oracle-xe (10.2.0.1-0.060128) unstable; urgency=low
 
   * Sync up to label 20060112 

Modified: trunk/debian/server/postrm
===================================================================
--- trunk/debian/server/postrm	2006-02-07 23:19:51 UTC (rev 21)
+++ trunk/debian/server/postrm	2006-02-08 00:49:17 UTC (rev 22)
@@ -5,7 +5,8 @@
 if [ -f /etc/oratab ]
 then
 	/bin/cp /etc/oratab /etc/oratab.xe
-	/bin/sed -i -s '/XE:/d' /etc/oratab.xe
+#	/bin/sed -i -s '/XE:/d' /etc/oratab.xe
+	/bin/sed -i -s '/XE:\/usr\/lib\/oracle\/xe\/app\/oracle\/product\/10.2.0\/server:N/d' /etc/oratab.xe
 	/bin/cp /etc/oratab.xe /etc/oratab
 	/bin/rm -f /etc/oratab.xe
 fi

Modified: trunk/debian/server/preinst
===================================================================
--- trunk/debian/server/preinst	2006-02-07 23:19:51 UTC (rev 21)
+++ trunk/debian/server/preinst	2006-02-08 00:49:17 UTC (rev 22)
@@ -16,6 +16,16 @@
 	unset ORACLE_BASE
 fi
 
+# Check for the existence of XE instance
+
+if `grep ^XE: /etc/oratab >/dev/null 2>&1`
+then
+	echo "The install cannot proceed because a database instance named 'XE' appears to be
+configured on the system.  Delete the instance, remove the entry corresponding 
+to this instance from the oratab file (/etc/oratab), and retry the installation."
+	exit 1
+fi
+
 # Check for sufficient diskspace
 if [ -d /usr/lib/oracle ] 
 then

Modified: trunk/sources/oracle-xe-10.2.0.1.tar.gz
===================================================================
(Binary files differ)

Modified: trunk/sources/oracle_server.spec
===================================================================
--- trunk/sources/oracle_server.spec	2006-02-07 23:19:51 UTC (rev 21)
+++ trunk/sources/oracle_server.spec	2006-02-08 00:49:17 UTC (rev 22)
@@ -36,6 +36,16 @@
 	/bin/sh -c "unset ORACLE_BASE"
 fi
 
+# Check for the existence of XE instance
+
+if `grep -q ^XE: /etc/oratab` 
+then
+	echo "The install cannot proceed because a database instance named 'XE' appears to be
+configured on the system.  Delete the instance, remove the entry corresponding 
+to this instance from the oratab file (/etc/oratab), and retry the installation."
+	exit 1
+fi
+
 # Check for sufficient diskspace
 if [ -d /usr/lib/oracle ] 
 then
@@ -530,7 +540,8 @@
 if [ -f /etc/oratab ]
 then
 	/bin/cp /etc/oratab /etc/oratab.xe
-	/bin/sed -i -s '/XE:/d' /etc/oratab.xe
+#	/bin/sed -i -s '/XE:/d' /etc/oratab.xe
+	/bin/sed -i -s '/XE:\/usr\/lib\/oracle\/xe\/app\/oracle\/product\/10.2.0\/server:N/d' /etc/oratab.xe
 	/bin/cp /etc/oratab.xe /etc/oratab
 	/bin/rm -f /etc/oratab.xe
 fi