From owner-svn-src-projects@FreeBSD.ORG  Mon Dec 31 15:37:18 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 0F4A2880;
 Mon, 31 Dec 2012 15:37:18 +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 CFB918FC08;
 Mon, 31 Dec 2012 15:37:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBVFbHKw057242;
 Mon, 31 Dec 2012 15:37:17 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBVFbHsd057241;
 Mon, 31 Dec 2012 15:37:17 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212311537.qBVFbHsd057241@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 31 Dec 2012 15:37:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244908 - 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: Mon, 31 Dec 2012 15:37:18 -0000

Author: linimon (doc,ports committer)
Date: Mon Dec 31 15:37:17 2012
New Revision: 244908
URL: http://svnweb.freebsd.org/changeset/base/244908

Log:
  Make this match the style of some other changes.  Add a comment about
  the untested fallback probably being wrong.

Modified:
  projects/portbuild/scripts/buildproxy

Modified: projects/portbuild/scripts/buildproxy
==============================================================================
--- projects/portbuild/scripts/buildproxy	Mon Dec 31 15:35:00 2012	(r244907)
+++ projects/portbuild/scripts/buildproxy	Mon Dec 31 15:37:17 2012	(r244908)
@@ -66,9 +66,11 @@ BUILDPROXY_SOCKET_FILE = config.get( 'BU
 PORTBUILD_USER = config.get( 'PORTBUILD_USER' )
 PORTBUILD_GROUP = config.get( 'PORTBUILD_GROUP' )
 
-portbuild_uid = PORTBUILD_USER
-if not portbuild_uid:
-    portbuild_uid = "ports-" + arch
+portbuild_user = PORTBUILD_USER
+if not portbuild_user:
+    # XXX MCL 20121229 probably does not work.
+    portbuild_user = "ports-" + arch
+portbuild_uid = getuidbyname( PORTBUILD_USER )
 
 if os.path.exists(BUILDPROXY_SOCKET_FILE):
     os.unlink(BUILDPROXY_SOCKET_FILE)
@@ -77,10 +79,10 @@ s.bind(BUILDPROXY_SOCKET_FILE)
 os.chmod(BUILDPROXY_SOCKET_FILE, 0600)
 if PORTBUILD_USER:
     if PORTBUILD_GROUP:
-        os.chown(BUILDPROXY_SOCKET_FILE, getuidbyname(PORTBUILD_USER), getgidbyname(PORTBUILD_GROUP))
+        os.chown(BUILDPROXY_SOCKET_FILE, portbuild_uid, getgidbyname(PORTBUILD_GROUP))
         os.chmod(BUILDPROXY_SOCKET_FILE, 0660)
     else:
-        os.chown(BUILDPROXY_SOCKET_FILE, getuidbyname(PORTBUILD_USER), -1)
+        os.chown(BUILDPROXY_SOCKET_FILE, portbuild_uid, -1)
 
 s.listen(10)