[csw-devel] SF.net SVN: gar:[8500] csw/mgar/pkg/chkconfig/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8500
          http://gar.svn.sourceforge.net/gar/?rev=8500&view=rev
Author:   dmichelsen
Date:     2010-02-11 15:50:51 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
alternatives: Some cas fixes

Modified Paths:
--------------
    csw/mgar/pkg/chkconfig/trunk/checksums
    csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives
    csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives

Modified: csw/mgar/pkg/chkconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/checksums	2010-02-11 15:32:46 UTC (rev 8499)
+++ csw/mgar/pkg/chkconfig/trunk/checksums	2010-02-11 15:50:51 UTC (rev 8500)
@@ -1,7 +1,7 @@
 d56d4f7b5aef5af5235943c384734780  0001-Add-missing-include-to-alloca.h.patch
 a1045173b8bc0a667883080f85a38597  0002-Don-t-use-named-struct-initializers.patch
 5abe74bf8f38f45068f43f12b52cfc4b  0003-Fix-manpage-to-use-csw-pathes.patch
-7acb4c811cecd886e010104270e6f2ff  CSWalternatives.i.cswalternatives
-9f2c7b5521878d39b4524588bf421eef  CSWalternatives.r.cswalternatives
+d021adfa40e57e62c435654111e7f08c  CSWalternatives.i.cswalternatives
+cd3e42659af6e3adfa8a220bd95dad29  CSWalternatives.r.cswalternatives
 02019af22d048085f3006de791a0c95e  alloca.patch
 592a1fe77f3844d7748adbab6357ee25  chkconfig-1.3.30c.tar.gz

Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives	2010-02-11 15:32:46 UTC (rev 8499)
+++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives	2010-02-11 15:50:51 UTC (rev 8500)
@@ -7,8 +7,6 @@
 #
 # 2010-02-11 Initial release
 
-set -x
-
 : ${PKG_INSTALL_ROOT:=/}
 
 while read src dest; do
@@ -33,13 +31,14 @@
     done
     
     if [ ! -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then
-      chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS
       echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2
       exit 2
     fi
 
+    chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS
+
     # Redo previous manual selection if this is an upgrade
-    if [ -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME" ]; then
+    if /usr/bin/test -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME"; then
       CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME"`
       if [ "${CHOICE}" = "$ALTPATH" ]; then
         echo "Applying previous manual selection ${CHOICE} ..."

Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives	2010-02-11 15:32:46 UTC (rev 8499)
+++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives	2010-02-11 15:50:51 UTC (rev 8500)
@@ -7,8 +7,6 @@
 #
 # 2010-02-11 Initial release
 
-set -x
-
 : ${PKG_INSTALL_ROOT:=/}
 
 while read dest; do
@@ -21,6 +19,7 @@
     if egrep '^manual$' ${PKG_INSTALL_ROOT}/var/opt/csw/alternatives/$2 >/dev/null 2>&1; then
       CHOICE="`perl -e 'print readlink $ARGV[0]' ${PKG_INSTALL_ROOT}/etc/opt/csw/alternatives/$2`"
       if [ "$3" = "${CHOICE}" ]; then
+        echo "Preserving '$2' manual choice ${CHOICE} ..."
         mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives
         rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2
         ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2


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