From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 28 12:39:31 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 75E17106564A;
	Thu, 28 Apr 2011 12:39:31 +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 632668FC0A;
	Thu, 28 Apr 2011 12:39:31 +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 p3SCdVC0023155;
	Thu, 28 Apr 2011 12:39:31 GMT (envelope-from flz@svn.freebsd.org)
Received: (from flz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3SCdVZJ023153;
	Thu, 28 Apr 2011 12:39:31 GMT (envelope-from flz@svn.freebsd.org)
Message-Id: <201104281239.p3SCdVZJ023153@svn.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Thu, 28 Apr 2011 12:39:31 +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: r221162 - 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: Thu, 28 Apr 2011 12:39:31 -0000

Author: flz
Date: Thu Apr 28 12:39:31 2011
New Revision: 221162
URL: http://svn.freebsd.org/changeset/base/221162

Log:
  portbuild: don't hardcode qmanager socket in qclient.
  
  Use freebsd_config module to get QMANAGER_SOCKET_FILE.

Modified:
  projects/portbuild/qmanager/qclient

Modified: projects/portbuild/qmanager/qclient
==============================================================================
--- projects/portbuild/qmanager/qclient	Thu Apr 28 11:21:49 2011	(r221161)
+++ projects/portbuild/qmanager/qclient	Thu Apr 28 12:39:31 2011	(r221162)
@@ -8,7 +8,22 @@
 import socket, os, sys
 
 from optparse import OptionParser
+
+pbc = os.getenv('PORTBUILD_CHECKOUT') \
+    if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild"
+pbd = os.getenv('PORTBUILD_DATA') \
+    if os.getenv('PORTBUILD_DATA') else "/var/portbuild"
+
+sys.path.insert(0, '%s/lib/python' % pbc)
+
 from qmanagerclient import *
+from freebsd_config import *
+
+CONFIG_SUBDIR="conf"
+CONFIG_FILENAME="server.conf"
+
+config = getConfig( pbc, CONFIG_SUBDIR, CONFIG_FILENAME )
+QMANAGER_SOCKET_FILE = config.get( 'QMANAGER_SOCKET_FILE' )
 
 def error(msg):
     print >>sys.stderr, "%s: %s" % (sys.argv[0], msg.rstrip())
@@ -88,10 +103,8 @@ def buildquery(option, opt, values, pars
     query.append("%s %s %s" % (key, operator, val))
 
 
-SOCKLOCAL = '/tmp/.qmgr'
-
 conn = QManagerClientConn(stderr = sys.stderr)
-conn.connect(SOCKLOCAL)
+conn.connect(QMANAGER_SOCKET_FILE)
 
 query=[]