From owner-svn-src-projects@FreeBSD.ORG Fri Nov 16 03:00:26 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1D9A7B09; Fri, 16 Nov 2012 03:00:26 +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 03EC48FC14; Fri, 16 Nov 2012 03:00:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAG30PXT004301; Fri, 16 Nov 2012 03:00:25 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAG30PPR004300; Fri, 16 Nov 2012 03:00:25 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201211160300.qAG30PPR004300@svn.freebsd.org> From: Mark Linimon Date: Fri, 16 Nov 2012 03:00:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243123 - projects/portbuild/conf 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: Fri, 16 Nov 2012 03:00:26 -0000 Author: linimon (doc,ports committer) Date: Fri Nov 16 03:00:25 2012 New Revision: 243123 URL: http://svnweb.freebsd.org/changeset/base/243123 Log: Slightly rework some definitions to make foot-shoting code in updatesnap* more robust. Modified: projects/portbuild/conf/server.conf Modified: projects/portbuild/conf/server.conf ============================================================================== --- projects/portbuild/conf/server.conf Fri Nov 16 02:57:42 2012 (r243122) +++ projects/portbuild/conf/server.conf Fri Nov 16 03:00:25 2012 (r243123) @@ -32,8 +32,11 @@ ZFS_VOLUME=a ZFS_MOUNTPOINT=/a SNAP_DIRECTORY=snap +# defines for /a/snap/ports-head/ports SNAP_PORTS_DIRECTORY=${SNAP_DIRECTORY}/ports-head -SNAP_SRC_DIRECTORY_PREFIX=${SNAP_DIRECTORY}/src- +# defines for /a/snap/src-/src +SRC_DIRECTORY_PREFIX=src- +SNAP_SRC_DIRECTORY_PREFIX=${SNAP_DIRECTORY}/${SRC_DIRECTORY_PREFIX} SUPFILE_DIRECTORY=/home/portmgr/sup PORTS_MASTER_SUPFILE=${SUPFILE_DIRECTORY}/ports-master-supfile