[csw-devel] SF.net SVN: gar:[20449] csw/mgar/pkg/cswclassutils/trunk/files

[bonivart at users.sourceforge.net]

Revision: 20449
          http://gar.svn.sourceforge.net/gar/?rev=20449&view=rev
Author:   bonivart
Date:     2013-03-13 10:23:39 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
cswclassutils/trunk: patches from Yann

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates	2013-03-13 09:59:50 UTC (rev 20448)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates	2013-03-13 10:23:39 UTC (rev 20449)
@@ -101,6 +101,10 @@
 
 
 	preservedir=$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG
+	if [ ! -d "$preservedir" ] && \
+		[ -d "$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" ]; then
+		preservedir="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES"
+	fi
 	confbasename=`basename $confdest`
 	preservedconf=$preservedir/$confbasename
 

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2013-03-13 09:59:50 UTC (rev 20448)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2013-03-13 10:23:39 UTC (rev 20449)
@@ -29,6 +29,10 @@
 SVCDIR=/var/opt/csw/svc
 
 SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
+if [ ! -d "$SMF_STATE_DIR" ] && \
+  [ -d "$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" ]; then
+    SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES"
+fi
 SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
 
 # retrieve the previous state of a service identified by the given FRMI

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf	2013-03-13 09:59:50 UTC (rev 20448)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf	2013-03-13 10:23:39 UTC (rev 20449)
@@ -48,6 +48,10 @@
 	esac
 
 	preservedir=$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG
+	if [ ! -d "$preservedir" ] && \
+		[ -d "$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES" ]; then
+			preservedir="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$OPENCSW_OBSOLETES"
+	fi
 	confbasename=`basename $confdest`
 	preservedconf=$preservedir/$confbasename
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.