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

[bonivart at users.sourceforge.net]

Revision: 8430
          http://gar.svn.sourceforge.net/gar/?rev=8430&view=rev
Author:   bonivart
Date:     2010-02-09 09:20:28 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
cswclassutils: working on bugs 4075, 4118 and 4143

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

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-02-09 09:12:25 UTC (rev 8429)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-02-09 09:20:28 UTC (rev 8430)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = cswclassutils
-GARVERSION = 1.31
+GARVERSION = 1.32
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf	2010-02-09 09:12:25 UTC (rev 8429)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf	2010-02-09 09:20:28 UTC (rev 8430)
@@ -32,7 +32,8 @@
 	else
 		echo Copying sample config to $confdest
 		[ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1
-		contents=`grep "^$dest" /var/sadm/install/contents`
+		file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"`
+		contents=`grep "^$file" $PKG_INSTALL_ROOT/var/sadm/install/contents`
 		mode=`echo $contents | awk '{print $4}'`
 		user=`echo $contents | awk '{print $5}'`
 		group=`echo $contents | awk '{print $6}'`

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2010-02-09 09:12:25 UTC (rev 8429)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2010-02-09 09:20:28 UTC (rev 8430)
@@ -92,6 +92,11 @@
     FMRI=
     if [ "`grep '^#FMRI' $dest`" ]; then
       FMRI=`grep '^#FMRI' $dest | awk '{print $2}'`
+      if [ "`echo $FMRI | grep '.'`" ]; then
+        echo "WARNING! FMRI path contained an illegal dot (removed)"
+        FMRI=`echo $FMRI | sed 's/\.//g'`
+        echo "New FMRI path: $FMRI"
+      fi
     fi
     if [ ! "$FMRI" ]; then
       FMRI=network

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf	2010-02-09 09:12:25 UTC (rev 8429)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf	2010-02-09 09:20:28 UTC (rev 8430)
@@ -40,7 +40,8 @@
 	else
 		echo Copying sample config to $confdest
 		[ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1
-                contents=`grep "^$dest" /var/sadm/install/contents`
+		file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"`
+		contents=`grep "^$file" $PKG_INSTALL_ROOT/var/sadm/install/contents`
                 mode=`echo $contents | awk '{print $4}'`
                 user=`echo $contents | awk '{print $5}'`
                 group=`echo $contents | awk '{print $6}'`


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