svn commit: r246667 - projects/portbuild/admin/scripts

[Mark Linimon]

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 *