Date: Thu, 17 Nov 2011 03:34:48 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r227605 - projects/portbuild/scripts Message-ID: <201111170334.pAH3Ymi0079777@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Thu Nov 17 03:34:48 2011 New Revision: 227605 URL: http://svn.freebsd.org/changeset/base/227605 Log: Automatically add new src branches after they are created. While here, improve error handling and make more verbose. Modified: projects/portbuild/scripts/updatesnap Modified: projects/portbuild/scripts/updatesnap ============================================================================== --- projects/portbuild/scripts/updatesnap Thu Nov 17 01:43:50 2011 (r227604) +++ projects/portbuild/scripts/updatesnap Thu Nov 17 03:34:48 2011 (r227605) @@ -36,22 +36,37 @@ echo "Started at $(date)" # We need to preserve group writability so portmgr group can write umask 002 -# for branch in 8; do for branch in $SRC_BRANCHES; do - cd ${base}${branch} + mountpoint=${base}${branch} + if [ ! -d ${mountpoint}/src ]; then + mkdir -p ${mountpoint} + echo "zfs create -o mountpoint=${mountpoint} ${zbase}${branch}" + zfs create -o mountpoint=${mountpoint} ${zbase}${branch} + mkdir -p ${mountpoint}/src + echo "zfs create -o mountpoint=${mountpoint}/src ${zbase}${branch}/src" + zfs create -o mountpoint=${mountpoint}/src ${zbase}${branch}/src + chown -R portmgr:portmgr ${mountpoint} + chmod -R g+w ${mountpoint} + fi + cd ${mountpoint} fulldate=$(date) supdate=$(supstamp ${fulldate}) eval tag=\$SRC_BRANCH_${branch}_TAG - cat ${SRC_MASTER_SUPFILE} | \ - sed "s|%%DATE%%|${supdate}|;s|%%PREFIX%%|${base}${branch}|;s|%%TAG%%|${tag}|" \ - > ${SRC_SUPFILE}.${branch}.now - # example destination directory: /a/snap/src-6/src/ (tricky!) - csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log - echo ${fulldate} > src/.updated - # hack for zfs breakiness - find . -group wheel|xargs chgrp portmgr - snapdate=$(stamp ${fulldate}) - zfs snapshot ${zbase}${branch}/src@${snapdate} + 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!) + echo "csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log" + csup -L 2 ${SRC_SUPFILE}.${branch}.now > src-csup.${branch}.log + echo ${fulldate} > src/.updated + # hack for zfs breakiness + find . -group wheel|xargs chgrp portmgr + snapdate=$(stamp ${fulldate}) + echo "zfs snapshot ${zbase}${branch}/src@${snapdate}" + zfs snapshot ${zbase}${branch}/src@${snapdate} + fi done finish 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111170334.pAH3Ymi0079777>