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

[bonivart at users.sourceforge.net]

Revision: 6999
          http://gar.svn.sourceforge.net/gar/?rev=6999&view=rev
Author:   bonivart
Date:     2009-10-28 15:46:40 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
cswclassutils: minor fixes #3959 and #3873

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

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2009-10-28 15:21:45 UTC (rev 6998)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2009-10-28 15:46:40 UTC (rev 6999)
@@ -1,17 +1,17 @@
 48a97af56d55bc90ce90303228ed8cc3  COPYING
-b98588da7f4feff19c3d5c0d365ae0a9  CSWcswclassutils.i.cswcpsampleconf
+fe030911decab669145b3017ed4fdf10  CSWcswclassutils.i.cswcpsampleconf
 56900bb1fc9f40f7c227877eca32b1f8  CSWcswclassutils.i.cswetcservices
 0dec9b16f322a26b4fa5cc6c89dfd418  CSWcswclassutils.i.cswinetd
 fa318ca696e80a9a9f2efbf35cb69080  CSWcswclassutils.i.cswinitsmf
 42668b41c7c886091a8ca44992b90806  CSWcswclassutils.i.cswmigrateconf
-9f125ebe17392ffa9a244e49a187206d  CSWcswclassutils.i.cswpreserveconf
+c875d62c8ddaad0de2e18fff7946e1e8  CSWcswclassutils.i.cswpreserveconf
 927297d22360707afd804c4ce58ed0a9  CSWcswclassutils.i.cswpycompile
 7f04b24b421f3afbf3c61845941ef5dd  CSWcswclassutils.i.cswusergroup
-4f926d97a780f9c116083e5e729c705c  CSWcswclassutils.r.cswcpsampleconf
+d278a28a6f901c4ff5f07c583b4cff3d  CSWcswclassutils.r.cswcpsampleconf
 d60261ddc46e2cc83ecbbfc586a7e686  CSWcswclassutils.r.cswetcservices
 9039ea60ad4c3f8994205fb242a49a72  CSWcswclassutils.r.cswinetd
 791db9c2f6685aca67043820d260fc60  CSWcswclassutils.r.cswinitsmf
 f7a2a10bbf0f88c1909a31141e6d83ce  CSWcswclassutils.r.cswmigrateconf
-a473d9cf739a6a33ac3a7306eb4a522c  CSWcswclassutils.r.cswpreserveconf
+96453922952c92c6c5a024e54ed8525f  CSWcswclassutils.r.cswpreserveconf
 02326250b63d3c75c45a8ff81768e923  CSWcswclassutils.r.cswpycompile
 752c74048ee18ae3a3c2c7b1d15e40f2  CSWcswclassutils.r.cswusergroup

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf	2009-10-28 15:21:45 UTC (rev 6998)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf	2009-10-28 15:46:40 UTC (rev 6999)
@@ -31,7 +31,7 @@
 		echo $confdest already exists. Not overwriting
 	else
 		echo Copying sample config to $confdest
-		[ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1
+		[ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1
 		contents=`grep "^$dest" /var/sadm/install/contents`
 		mode=`echo $contents | awk '{print $4}'`
 		user=`echo $contents | awk '{print $5}'`

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf	2009-10-28 15:21:45 UTC (rev 6998)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf	2009-10-28 15:46:40 UTC (rev 6999)
@@ -39,7 +39,7 @@
 		echo $confdest already exists. Not overwriting
 	else
 		echo Copying sample config to $confdest
-		[ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync -R $PKG_INSTALL_ROOT > /dev/null 2>&1
+		[ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1
                 contents=`grep "^$dest" /var/sadm/install/contents`
                 mode=`echo $contents | awk '{print $4}'`
                 user=`echo $contents | awk '{print $5}'`

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf	2009-10-28 15:21:45 UTC (rev 6998)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcpsampleconf	2009-10-28 15:46:40 UTC (rev 6999)
@@ -23,7 +23,7 @@
 	if cmp $confdest $dest >/dev/null ; then
 		echo $confdest is identical to sample config file $dest
 		echo Removing $confdest
-		rm $confdest
+		rm -f $confdest
 	fi
-	rm $dest
+	rm -f $dest
 done

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf	2009-10-28 15:21:45 UTC (rev 6998)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf	2009-10-28 15:46:40 UTC (rev 6999)
@@ -28,7 +28,7 @@
 		if cmp $confdest $dest >/dev/null ; then
 			echo $confdest is identical to sample config file $dest
 			echo Removing $confdest
-			rm $confdest
+			rm -f $confdest
 		else
 			echo "preserving $confdest to $preservedconf"
 			mkdir -p $preservedir
@@ -37,5 +37,5 @@
 	fi
 
 	# Any way it shakes out, we always remove the "sample conf"
-	rm $dest
+	rm -f $dest
 done


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