From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 11 12:49:38 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 9AE17C33;
 Mon, 11 Feb 2013 12:49:38 +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 892F06E3;
 Mon, 11 Feb 2013 12:49:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCnciG094763;
 Mon, 11 Feb 2013 12:49:38 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCncXD094760;
 Mon, 11 Feb 2013 12:49:38 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201302111249.r1BCncXD094760@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 11 Feb 2013 12:49:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246667 - projects/portbuild/admin/scripts
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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Feb 2013 12:49:38 -0000

Author: linimon (doc,ports committer)
Date: Mon Feb 11 12:49:37 2013
New Revision: 246667
URL: http://svnweb.freebsd.org/changeset/base/246667

Log:
  Prepare for move of portbuild/lib to portbuild/admin/lib.  lib/ now needs
  to be owned by srcbuild, thus the move.

Modified:
  projects/portbuild/admin/scripts/zbackup
  projects/portbuild/admin/scripts/zexpire

Modified: projects/portbuild/admin/scripts/zbackup
==============================================================================
--- projects/portbuild/admin/scripts/zbackup	Mon Feb 11 12:42:11 2013	(r246666)
+++ projects/portbuild/admin/scripts/zbackup	Mon Feb 11 12:49:37 2013	(r246667)
@@ -6,7 +6,10 @@
 import commands, datetime, sys, os, bz2
 from signal import *
 
-sys.path.insert(0, '/var/portbuild/lib/python')
+pbc = os.getenv('PORTBUILD_CHECKOUT') \
+    if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild"
+
+sys.path.insert(0, '%s/admin/lib/python' % pbc)
 
 import zfs
 

Modified: projects/portbuild/admin/scripts/zexpire
==============================================================================
--- projects/portbuild/admin/scripts/zexpire	Mon Feb 11 12:42:11 2013	(r246666)
+++ projects/portbuild/admin/scripts/zexpire	Mon Feb 11 12:49:37 2013	(r246667)
@@ -6,10 +6,8 @@ import sys, commands, datetime, os, stri
 
 pbc = os.getenv('PORTBUILD_CHECKOUT') \
     if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild"
-pbd = os.getenv('PORTBUILD_DATA') \
-    if os.getenv('PORTBUILD_DATA') else "/a/portbuild"
 
-sys.path.insert(0, '%s/lib/python' % pbc)
+sys.path.insert(0, '%s/admin/lib/python' % pbc)
 
 from freebsd import *
 from freebsd_config import *