From owner-svn-src-projects@FreeBSD.ORG  Sat Apr 30 20:14:20 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79455106564A;
	Sat, 30 Apr 2011 20:14:20 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 665628FC0A;
	Sat, 30 Apr 2011 20:14:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3UKEKVS060592;
	Sat, 30 Apr 2011 20:14:20 GMT (envelope-from flz@svn.freebsd.org)
Received: (from flz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3UKEK1P060590;
	Sat, 30 Apr 2011 20:14:20 GMT (envelope-from flz@svn.freebsd.org)
Message-Id: <201104302014.p3UKEK1P060590@svn.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Sat, 30 Apr 2011 20:14:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221268 - projects/portbuild/qmanager
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 30 Apr 2011 20:14:20 -0000

Author: flz
Date: Sat Apr 30 20:14:20 2011
New Revision: 221268
URL: http://svn.freebsd.org/changeset/base/221268

Log:
  portbuild: various fixes.
  
  - Fix path to portbuild now that per-build scripts are in /tmp/${buildid}.
  - Resolve buildid, in case it's "latest" or "previous".

Modified:
  projects/portbuild/qmanager/packagebuild

Modified: projects/portbuild/qmanager/packagebuild
==============================================================================
--- projects/portbuild/qmanager/packagebuild	Sat Apr 30 17:59:54 2011	(r221267)
+++ projects/portbuild/qmanager/packagebuild	Sat Apr 30 20:14:20 2011	(r221268)
@@ -411,7 +411,6 @@ class worker(threading.Thread):
         self.branch = branch
         self.buildid = buildid
         self.queue = queue
-        self.basedir = pbd+"/"+arch+"/"+branch+"/builds/"+buildid
 
         self.setDaemon(True)
 
@@ -437,7 +436,7 @@ class worker(threading.Thread):
             build = subprocess.Popen(
                 ["/bin/sh", "%s/scripts/pdispatch" % pbc,
                  self.arch, self.branch, self.buildid, self.machine,
-                 "%s/scripts/portbuild" % self.basedir, "%s.tbz" % pkg.name,
+                 "/tmp/%s/scripts/portbuild" % self.buildid, "%s.tbz" % pkg.name,
                  pkg.path],
 		 env=runenv,    
                 stderr=subprocess.STDOUT, stdout=subprocess.PIPE, bufsize=0)
@@ -509,7 +508,8 @@ class worker(threading.Thread):
 def main(arch, branch, buildid, args):
     global index
 
-    basedir=pbd+"/"+arch+"/"+branch+"/builds/"+buildid
+    basedir=os.path.realpath(pbd+"/"+arch+"/"+branch+"/builds/"+buildid)
+    buildid=basedir.split("/")[-1]
     portsdir=basedir+"/ports"
 
     # get the major branch number.