From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 14:53:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2A178F43; Wed, 13 Feb 2013 14:53:56 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 050EE849; Wed, 13 Feb 2013 14:53:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1DErtd0007346; Wed, 13 Feb 2013 14:53:55 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1DErt0l007345; Wed, 13 Feb 2013 14:53:55 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302131453.r1DErt0l007345@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 14:53:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246761 - projects/portbuild/admin/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 14:53:56 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 14:53:55 2013 New Revision: 246761 URL: http://svnweb.freebsd.org/changeset/base/246761 Log: Fix the location for SRCBUILD_OWNED_CONVENIENCE_SUBDIRS. While here, clean up and consolidate. Modified: projects/portbuild/admin/tools/mkportbuild Modified: projects/portbuild/admin/tools/mkportbuild ============================================================================== --- projects/portbuild/admin/tools/mkportbuild Wed Feb 13 13:55:54 2013 (r246760) +++ projects/portbuild/admin/tools/mkportbuild Wed Feb 13 14:53:55 2013 (r246761) @@ -22,7 +22,7 @@ PORTBUILD_OWNED_SUBDIRS="portbuild" # define ownership of subdirectories of DEFAULT_ZFS_VOLUME/portbuild/ SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" -SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles" +SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" if [ `id -u` != 0 ]; then @@ -178,9 +178,6 @@ zfs allow ${ZFS_VOLUME} chown ${SRCBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild chmod 775 ${ZFS_MOUNTPOINT}/portbuild -PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" -SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" - for subdir in ${PORTBUILD_OWNED_VCS_SUBDIRS}; do echo "checking out the ${subdir} repository as user ${PORTBUILD_USER} ..." if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${subdir} ]; then @@ -209,7 +206,6 @@ echo "$0: in ${ZFS_MOUNTPOINT}/portbuild # create convenience directories for PORTBUILD_USER. failure is annoying # but non-fatal. -PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" for extra_dir in ${PORTBUILD_OWNED_CONVENIENCE_SUBDIRS}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 @@ -218,10 +214,9 @@ for extra_dir in ${PORTBUILD_OWNED_CONVE done # create convenience directories for SRCBUILD_USER. -SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" for extra_dir in ${SRCBUILD_OWNED_CONVENIENCE_SUBDIRS}; do - if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then - su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} ]; then + su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} 2> /dev/null" || exit 1 fi chgrp ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null done