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

[dmichelsen at users.sourceforge.net]

Revision: 8647
          http://gar.svn.sourceforge.net/gar/?rev=8647&view=rev
Author:   dmichelsen
Date:     2010-02-18 12:47:10 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
alternatives: Associate preservations with the package where something is preserved

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-18 12:43:29 UTC (rev 8646)
+++ csw/mgar/pkg/chkconfig/trunk/checksums	2010-02-18 12:47:10 UTC (rev 8647)
@@ -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
-d021adfa40e57e62c435654111e7f08c  CSWalternatives.i.cswalternatives
-cd3e42659af6e3adfa8a220bd95dad29  CSWalternatives.r.cswalternatives
+5e7b546021e5606165c34f154b70bc7b  CSWalternatives.i.cswalternatives
+b610f50080c8ffe65037bb9891316935  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-18 12:43:29 UTC (rev 8646)
+++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives	2010-02-18 12:47:10 UTC (rev 8647)
@@ -38,12 +38,12 @@
     chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS
 
     # Redo previous manual selection if this is an upgrade
-    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 /usr/bin/test -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"; then
+      CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"`
       if [ "${CHOICE}" = "$ALTPATH" ]; then
         echo "Applying previous manual selection ${CHOICE} ..."
         chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --set $ALTNAME ${CHOICE}
-        rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME
+        rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME
       fi
     fi
   done

Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives	2010-02-18 12:43:29 UTC (rev 8646)
+++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives	2010-02-18 12:47:10 UTC (rev 8647)
@@ -20,9 +20,9 @@
       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
+        mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives
+        rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2
+        ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2
       fi
     fi
 


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