Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 16 Dec 2012 21:10:22 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r244313 - projects/portbuild/scripts
Message-ID:  <201212162110.qBGLAM5e052168@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: linimon (doc,ports committer)
Date: Sun Dec 16 21:10:22 2012
New Revision: 244313
URL: http://svnweb.freebsd.org/changeset/base/244313

Log:
  Get rid of group writeability.  Don't write .updated until it really has.

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

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Sun Dec 16 21:05:54 2012	(r244312)
+++ projects/portbuild/scripts/updatesnap	Sun Dec 16 21:10:22 2012	(r244313)
@@ -32,9 +32,6 @@ finish() {
 begin=$(date +%s)
 echo "Started at $(date)"
 
-# We need to preserve group writability
-umask 002
-
 uid=${PORTBUILD_USER}
 if [ ! -z "${PORTBUILD_GROUP}" ]; then
     gid=${PORTBUILD_GROUP}
@@ -93,7 +90,6 @@ for branch in $SRC_BRANCHES; do
       fi
       ${VCS_OVERWRITE_COMMAND} ${mountpoint}/src || finish 1
     fi
-    echo ${fulldate} > src/.updated
     # hack for zfs breakiness
     find . -group wheel | xargs chgrp ${gid}
     snapdate=$(stamp ${fulldate})
@@ -101,6 +97,7 @@ for branch in $SRC_BRANCHES; do
       echo "zfs snapshot ${zbase_prefix}${branch}/src@${snapdate}"
     fi
     zfs snapshot ${zbase_prefix}${branch}/src@${snapdate} || finish 1
+    echo ${fulldate} > src/.updated
 done
 
 finish 0

Modified: projects/portbuild/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/scripts/updatesnap.ports	Sun Dec 16 21:05:54 2012	(r244312)
+++ projects/portbuild/scripts/updatesnap.ports	Sun Dec 16 21:10:22 2012	(r244313)
@@ -32,9 +32,6 @@ finish() {
 begin=$(date +%s)
 echo "Started at $(date)"
 
-# We need to preserve group writability
-umask 002
-
 uid=${PORTBUILD_USER}
 if [ ! -z "${PORTBUILD_GROUP}" ]; then
     gid=${PORTBUILD_GROUP}
@@ -85,7 +82,6 @@ else
   fi
   ${VCS_OVERWRITE_COMMAND} ${head}/ports || finish 1
 fi
-echo ${fulldate} > ports/.updated
 # hack for zfs breakiness
 find . -group wheel | xargs chgrp ${gid}
 snapdate=$(stamp ${fulldate})
@@ -93,5 +89,6 @@ if [ $VERBOSE ]; then
   echo "zfs snapshot ${zhead}/ports@${snapdate}"
 fi
 zfs snapshot ${zhead}/ports@${snapdate} || finish 1
+echo ${fulldate} > ports/.updated
 
 finish 0

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212162110.qBGLAM5e052168>