From owner-p4-projects@FreeBSD.ORG Thu Nov 29 19:42:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A991F16A47B; Thu, 29 Nov 2007 19:42:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1815016A474 for ; Thu, 29 Nov 2007 19:42:32 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07EB413C468 for ; Thu, 29 Nov 2007 19:42:32 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lATJgVWi097965 for ; Thu, 29 Nov 2007 19:42:31 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lATJgVBi097962 for perforce@freebsd.org; Thu, 29 Nov 2007 19:42:31 GMT (envelope-from gcooper@FreeBSD.org) Date: Thu, 29 Nov 2007 19:42:31 GMT Message-Id: <200711291942.lATJgVBi097962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 129789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2007 19:42:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=129789 Change 129789 by gcooper@shiina-ibook on 2007/11/29 19:42:08 Still not sure how far the sandbox will encompass the rest of the operations, but in the event that the sandbox is a necessary component for all operations, add the option of creating or not creating the physical sandbox.. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ struct pkg_sandbox * pkg_sandbox_new(struct pkg *package, const char *pkg_prefix, + int create_sandbox, pkg_sandbox_purge_sandbox_callback *purge, pkg_sandbox_destroy_sandbox_callback *destroy, pkg_sandbox_set_stage_callback *set_stage, @@ -75,8 +76,13 @@ strcat(sandbox->workdir, "/"); strcat(sandbox->workdir, package->pkg_name); - if (0 != flock(sandbox->work_dir, LOCK_UN)) - return PKG_SANDBOX_UNLOCK_FAIL; + if (create_sandbox != 0) { + + if (0 != flock(sandbox->work_dir, LOCK_UN)) + return PKG_SANDBOX_UNLOCK_FAIL; + + } + sandbox->real_file = create_sandbox; return sandbox; ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#2 (text+ko) ==== @@ -52,7 +52,7 @@ struct pkg_sandbox; -struct pkg_sandbox* pkg_sandbox_new(package *, const char *, +struct pkg_sandbox* pkg_sandbox_new(package *, const char *, int, pkg_sandbox_purge_sandbox_callback *, pkg_sandbox_destroy_sandbox_callback *, pkg_sandbox_set_stage_callback *, ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ typedef int pkg_sandbox_set_stage_callback(struct pkg_sandbox*, int); typedef int pkg_sandbox_free_sandbox_callback(struct pkg_sandbox *); -struct pkg_sandbox* pkg_sandbox_new(package *, const char *, +struct pkg_sandbox* pkg_sandbox_new(package *, const char *, int, pkg_sandbox_purge_sandbox_callback *, pkg_sandbox_destroy_sandbox_callback *, pkg_sandbox_set_stage_callback *,