svn commit: r243121 - projects/portbuild/scripts

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Fri Nov 16 02:56:20 2012
New Revision: 243121
URL: http://svnweb.freebsd.org/changeset/base/243121

Log:
  Remove dead code.  Uncomment zfs code for updatesnap.ports only at this time.

Modified:
  projects/portbuild/scripts/updatesnap
  projects/portbuild/scripts/updatesnap.ports

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Fri Nov 16 02:55:03 2012	(r243120)
+++ projects/portbuild/scripts/updatesnap	Fri Nov 16 02:56:20 2012	(r243121)
@@ -14,13 +14,6 @@ zbase_prefix=${ZFS_VOLUME}/${SNAP_DIRECT
 
 VERBOSE=1
 
-# XXX MCL 20121115 try to switch to SVN
-#supstamp() {
-#	fulldate=$1
-#        date -j -f %+ "${fulldate}" +%Y.%m.%d.%H.%M.%S
-#}
-# XXX MCL 20121115 try to switch to SVN
-
 stamp() {
 	fulldate=$1
         date -j -f %+ "${fulldate}" +%Y%m%d%H%M%S
@@ -74,22 +67,10 @@ for branch in $SRC_BRANCHES; do
   fi
   cd ${mountpoint}
   fulldate=$(date)
-# XXX MCL 20121115 try to switch to SVN
-#  supdate=$(supstamp ${fulldate})
-#  eval tag=\$SRC_BRANCH_${branch}_TAG
-#  if [ ! -f ${SRC_MASTER_SUPFILE} ]; then
-#    echo "${SRC_MASTER_SUPFILE} does not exist!"
-#  else
-#    sed "s|%%DATE%%|${supdate}|;s|%%PREFIX%%|${mountpoint}|;s|%%TAG%%|${tag}|" \
-#      ${SRC_MASTER_SUPFILE} > ${SRC_SUPFILE}.${branch}.now
-#    # example destination directory: /a/snap/src-7/src/ (tricky!)
-#    if [ $VERBOSE ]; then
-#      echo "csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log"
-#    fi
-#    csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log
-# XXX MCL 20121115 try to switch to SVN
+
+    # TODO: fix identation post-rework
+
     # example destination directory: /a/snap/src-7/src/ (tricky!)
-    echo "XXX now at `pwd -P`"
     if [ ! -d ${mountpoint}/src ]; then
       mkdir ${mountpoint}/src || finish 1
     fi
@@ -105,7 +86,6 @@ for branch in $SRC_BRANCHES; do
       fi
       #svn up || finish 1
     fi
-# XXX MCL 20121115 try to switch to SVN
     echo ${fulldate} > src/.updated
     # hack for zfs breakiness
     find . -group wheel|xargs chgrp portmgr
@@ -114,9 +94,6 @@ for branch in $SRC_BRANCHES; do
       echo "#zfs snapshot ${zbase_prefix}${branch}/src@${snapdate}"
     fi
     #zfs snapshot ${zbase_prefix}${branch}/src@${snapdate} || finish 1
-# XXX MCL 20121115 try to switch to SVN
-#  fi
-# XXX MCL 20121115 try to switch to SVN
 done
 
 finish 0

Modified: projects/portbuild/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/scripts/updatesnap.ports	Fri Nov 16 02:55:03 2012	(r243120)
+++ projects/portbuild/scripts/updatesnap.ports	Fri Nov 16 02:56:20 2012	(r243121)
@@ -14,13 +14,6 @@ zhead=${ZFS_VOLUME}/${SNAP_PORTS_DIRECTO
 
 VERBOSE=1
 
-# XXX MCL 20121115 try to switch to SVN
-#supstamp() {
-#	fulldate=$1
-#        date -j -f %+ "${fulldate}" +%Y.%m.%d.%H.%M.%S
-#}
-# XXX MCL 20121115 try to switch to SVN
-
 stamp() {
 	fulldate=$1
         date -j -f %+ "${fulldate}" +%Y%m%d%H%M%S
@@ -64,14 +57,6 @@ fi
 
 cd ${head}
 fulldate=$(date)
-# XXX MCL 20121115 try to switch to SVN
-#supdate=$(supstamp ${fulldate})
-#cat ${PORTS_MASTER_SUPFILE} | \
-#  sed "s|%%DATE%%|${supdate}|;s|%%PREFIX%%|${head}|" \
-#  > ${PORTS_SUPFILE}.now
-# example destination directory: /a/snap/ports-head/ports/
-#csup -L 2 ${PORTS_SUPFILE}.now > ports-csup.log
-# XXX MCL 20121115 try to switch to SVN
 if [ ! -d ${head}/ports ]; then
   mkdir ${head}/ports || finish 1
 fi
@@ -82,16 +67,16 @@ if [ ! -d .svn ]; then
   svn checkout svn+ssh://svn.freebsd.org/ports/head ${head}/ports || finish 1
 else
   if [ $VERBOSE ]; then
-      echo "#svn up"
+      echo "svn up"
   fi
-  #svn up || finish 1
+  svn up || finish 1
 fi
 echo ${fulldate} > ports/.updated
 # hack for zfs breakiness
 find . -group wheel|xargs chgrp portmgr
 snapdate=$(stamp ${fulldate})
 if [ $VERBOSE ]; then
-    echo "#zfs snapshot ${zhead}/ports@${snapdate}"
+  echo "zfs snapshot ${zhead}/ports@${snapdate}"
 fi
 zfs snapshot ${zhead}/ports@${snapdate} || finish 1