From owner-svn-src-projects@FreeBSD.ORG  Mon Aug  1 02:56:02 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 E9041106566C;
	Mon,  1 Aug 2011 02:56:02 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF25D8FC15;
	Mon,  1 Aug 2011 02:56:02 +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 p712u2ML073868;
	Mon, 1 Aug 2011 02:56:02 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p712u2vS073866;
	Mon, 1 Aug 2011 02:56:02 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201108010256.p712u2vS073866@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 1 Aug 2011 02:56:02 +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: r224557 - 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: Mon, 01 Aug 2011 02:56:03 -0000

Author: linimon (doc,ports committer)
Date: Mon Aug  1 02:56:02 2011
New Revision: 224557
URL: http://svn.freebsd.org/changeset/base/224557

Log:
  Touch up some of the debug stuff.

Modified:
  projects/portbuild/qmanager/qmanagerhandler.py

Modified: projects/portbuild/qmanager/qmanagerhandler.py
==============================================================================
--- projects/portbuild/qmanager/qmanagerhandler.py	Sun Jul 31 23:09:11 2011	(r224556)
+++ projects/portbuild/qmanager/qmanagerhandler.py	Mon Aug  1 02:56:02 2011	(r224557)
@@ -4,7 +4,7 @@ import SocketServer, threading, freebsd,
 from qmanagerclient import *
 from acl import *
 
-DEBUG=False
+DEBUG_HANDLER = False
 
 class ServerReplyException(Exception):
     pass
@@ -140,13 +140,13 @@ class UNIXhandler(SocketServer.StreamReq
         conn = QManagerServerConn(self.rfile, self.wfile, self.event)
 
         try:
-            if DEBUG:
+            if DEBUG_HANDLER:
                 print "at UNIXhandler.handle()"
             (conn.cmd, conn.args) = conn.receive()
-            if DEBUG:
+            if DEBUG_HANDLER:
                 print "past conn.receive() for " + conn.cmd + " and " + str( conn.args )
             (conn.uid, conn.gids) = freebsd.getpeerid(self.request)
-            if DEBUG:
+            if DEBUG_HANDLER:
                 print "past freebsd.getpeerid"
             if conn.uid == 0:
                 # Allow root to override uid/gids, when proxying for a user
@@ -159,14 +159,14 @@ class UNIXhandler(SocketServer.StreamReq
                 except KeyError, TypeError:
                     pass
         except Exception, e:
-            if DEBUG:
+            if DEBUG_HANDLER:
                 print "UNIXhandler.handle(): exception: " + str( e )
             conn.send(401) # XXX other errors too
             return
             
         self.server.wqueue.put(conn)
-        if DEBUG:
+        if DEBUG_HANDLER:
             print "past wqueue.put() for " + conn.cmd + " and " + str( conn.args )
         self.event.wait() # Don't close socket until the command finishes
-        if DEBUG:
+        if DEBUG_HANDLER:
             print "past event.wait() for " + conn.cmd + " and " + str( conn.args )