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

[wahwah at users.sourceforge.net]

Revision: 8009
          http://gar.svn.sourceforge.net/gar/?rev=8009&view=rev
Author:   wahwah
Date:     2010-01-15 09:04:37 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
cswclassutils: migrateconf: Print out the warning only when actually migrating files.

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/checksums
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-01-15 03:36:37 UTC (rev 8008)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-01-15 09:04:37 UTC (rev 8009)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = cswclassutils
-GARVERSION = 1.30
+GARVERSION = 1.31
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2010-01-15 03:36:37 UTC (rev 8008)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2010-01-15 09:04:37 UTC (rev 8009)
@@ -4,7 +4,7 @@
 56900bb1fc9f40f7c227877eca32b1f8  CSWcswclassutils.i.cswetcservices
 4f2e9de463cb4b17ba6e1b3dfdf18913  CSWcswclassutils.i.cswinetd
 fa318ca696e80a9a9f2efbf35cb69080  CSWcswclassutils.i.cswinitsmf
-42668b41c7c886091a8ca44992b90806  CSWcswclassutils.i.cswmigrateconf
+5049a5d77ddcc3359d1c991d387446f1  CSWcswclassutils.i.cswmigrateconf
 c875d62c8ddaad0de2e18fff7946e1e8  CSWcswclassutils.i.cswpreserveconf
 9018419febe06c12e89d66cc76e7261f  CSWcswclassutils.i.cswpycompile
 1282bef941c49d98a061b3701a1fda7c  CSWcswclassutils.i.cswtexinfo

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf	2010-01-15 03:36:37 UTC (rev 8008)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf	2010-01-15 09:04:37 UTC (rev 8009)
@@ -43,6 +43,12 @@
 fi
 
 give_a_chance_to_stop() {
+  if [ "${chance_to_stop_given}" -ne 0 ]; then
+    return
+  fi
+  echo "----8<---- migration configuration start ----8<----"
+  cat "${confdst}"
+  echo "----8<---- migration configuration end   ----8<----"
   echo
   echo "*******************************************************************"
   echo "* Configuration files are going to be migrated from the deprecated "
@@ -57,6 +63,7 @@
     sleep 1
   done
   echo "0."
+  chance_to_stop_given=1
 }
 
 files_are_identical() {
@@ -139,15 +146,11 @@
 }
 
 run_already=0
+chance_to_stop_given=0
 
 while read confsrc confdst ; do
   # We're not sure if the files to be migrated have already been copied or not.
-
   cp "$confsrc" "$confdst"
-
-  cat "${confdst}"
-  give_a_chance_to_stop
-
   # Sourcing the file, it should contain the configuration.
   if [ -r "$confsrc" ]; then
     debug "Sourcing ${confsrc}"
@@ -217,6 +220,7 @@
     # moved already.
     if [ -r "${srcpath}" ]
     then
+      give_a_chance_to_stop
       place_signpost_for "${srcpath}"
       debug "Moving '${srcpath}' to '${archpath}'"
       mv "${srcpath}" "${archpath}"


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