Date: Thu, 28 Apr 2011 12:39:31 +0000 (UTC) From: Florent Thoumie <flz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r221162 - projects/portbuild/qmanager Message-ID: <201104281239.p3SCdVZJ023153@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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=[]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104281239.p3SCdVZJ023153>