From owner-svn-src-projects@FreeBSD.ORG  Fri Dec 14 16:12:17 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4D1DF1BD;
 Fri, 14 Dec 2012 16:12:17 +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 170D38FC08;
 Fri, 14 Dec 2012 16:12:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEGCG7L094561;
 Fri, 14 Dec 2012 16:12:16 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEGCGVa094560;
 Fri, 14 Dec 2012 16:12:16 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212141612.qBEGCGVa094560@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 14 Dec 2012 16:12:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244222 - projects/portbuild/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: Fri, 14 Dec 2012 16:12:17 -0000

Author: linimon (doc,ports committer)
Date: Fri Dec 14 16:12:16 2012
New Revision: 244222
URL: http://svnweb.freebsd.org/changeset/base/244222

Log:
  Un-hardwire ports-<arch> if PORTBUILD_USER/_GROUP are defined.

Modified:
  projects/portbuild/scripts/pollmachine

Modified: projects/portbuild/scripts/pollmachine
==============================================================================
--- projects/portbuild/scripts/pollmachine	Fri Dec 14 16:04:09 2012	(r244221)
+++ projects/portbuild/scripts/pollmachine	Fri Dec 14 16:12:16 2012	(r244222)
@@ -39,6 +39,12 @@ pbd = os.getenv('PORTBUILD_DATA') \
 
 sys.path.insert(0, '%s/lib/python' % pbc)
 
+from freebsd import *
+from freebsd_config import *
+
+CONFIG_SUBDIR="conf"
+CONFIG_FILENAME="server.conf"
+
 if len(sys.argv) < 1:
     print "Usage: %s <arch> [<arch> ...]" % sys.argv[0]
     sys.exit(1)
@@ -65,6 +71,7 @@ for i in sys.argv[1:]:
 
 # set of machines for each arch
 machines={}
+# XXX MCL would be nice to remove this hardwiring
 for i in arches:
     machines[i]=set()
 
@@ -274,14 +281,20 @@ class MachinePoll(threading.Thread):
             logging.info("%s finished polling for %s" % ( str(self), self.mach ))
 
     def setup(self, branch, buildid, args = ""):
-        cmd = "su ports-%s -c \"%s/scripts/dosetupnode %s %s %s %s %s\""\
-            % (self.arch, pbc, self.arch, branch, buildid, self.mach, args)
+        uid = PORTBUILD_USER
+        if not uid:
+            uid = "ports-" + self.arch
+        cmd = "su %s -c \"%s/scripts/dosetupnode %s %s %s %s %s\""\
+            % (uid, pbc, self.arch, branch, buildid, self.mach, args)
         child = subprocess.Popen(cmd, shell=True, stderr = subprocess.STDOUT,
                                  stdout = subprocess.PIPE)
         err = child.wait()
         out = "".join(child.stdout.readlines())
         return (err, out)
 
+config = getConfig( pbc, CONFIG_SUBDIR, CONFIG_FILENAME )
+PORTBUILD_USER = config.get( 'PORTBUILD_USER' )
+
 logging.basicConfig(level=logging.INFO,
                     format='[%(asctime)s] %(message)s',
                     datefmt='%d %b %Y %H:%M:%S',