Date: Sat, 30 Apr 2011 20:14:20 +0000 (UTC) From: Florent Thoumie <flz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r221268 - projects/portbuild/qmanager Message-ID: <201104302014.p3UKEK1P060590@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104302014.p3UKEK1P060590>