From owner-svn-src-projects@FreeBSD.ORG Mon Aug 1 02:57:02 2011 Return-Path: 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 28FC81065670; Mon, 1 Aug 2011 02:57: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 0DFB58FC0A; Mon, 1 Aug 2011 02:57: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 p712v1jG073933; Mon, 1 Aug 2011 02:57:01 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p712v1At073931; Mon, 1 Aug 2011 02:57:01 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201108010257.p712v1At073931@svn.freebsd.org> From: Mark Linimon Date: Mon, 1 Aug 2011 02:57:01 +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: r224558 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2011 02:57:02 -0000 Author: linimon (doc,ports committer) Date: Mon Aug 1 02:57:01 2011 New Revision: 224558 URL: http://svn.freebsd.org/changeset/base/224558 Log: Make the error handling tell us more about the exceptions, if any. Modified: projects/portbuild/qmanager/qmanagerclient.py Modified: projects/portbuild/qmanager/qmanagerclient.py ============================================================================== --- projects/portbuild/qmanager/qmanagerclient.py Mon Aug 1 02:56:02 2011 (r224557) +++ projects/portbuild/qmanager/qmanagerclient.py Mon Aug 1 02:57:01 2011 (r224558) @@ -300,12 +300,12 @@ class QManagerClientConn(QManagerConnect return s except Exception, e: if self.stderr: - self.stderr.write("QManagerClientConn: exception in s.makefile(): " + str( e ) + "\n") + self.stderr.write("\nQManagerClientConn: exception in s.makefile(): " + str( e ) + "\n") self.stderr.write(str( path ) + "\n") self.stderr.flush() except Exception, e: if self.stderr: - self.stderr.write("QManagerClientConn: exception in s.connect(): " + str( e ) + "\n") + self.stderr.write("\nQManagerClientConn: exception in s.connect(): " + str( e ) + "\n") self.stderr.write(str( path ) + "\n") self.stderr.flush() try: @@ -314,7 +314,7 @@ class QManagerClientConn(QManagerConnect pass else: if self.stderr: - self.stderr.write("QManagerClientConn: qmanager socket file does not exist!\n") + self.stderr.write("\nQManagerClientConn: qmanager socket file does not exist!\n") self.stderr.flush() return None @@ -333,8 +333,9 @@ class QManagerClientConn(QManagerConnect while True: try: return self.CS.send(self.sockfile, cmd, vars) - except: + except Exception, e: if self.stderr: + self.stderr.write("\nQManagerClientConn: exception in self.SC.send(): " + str( e ) + "\n") self.stderr.write("Error sending command...\n") self.stderr.flush() sleep(timeout) @@ -349,8 +350,9 @@ class QManagerClientConn(QManagerConnect while True: try: return self.SC.receive(self.sockfile) - except: + except Exception, e: if self.stderr: + self.stderr.write("\nQManagerClientConn: exception in self.SC.receive(): " + str( e ) + "\n") self.stderr.write("Error receiving command...\n") self.stderr.flush() sleep(timeout) @@ -394,7 +396,7 @@ class QManagerClientConn(QManagerConnect if self.connect(): break else: - self.stderr.write("Error connecting to qmanager...\n") + self.stderr.write("\nQManagerClientConn: error connecting to qmanager in command()...\n") self.stderr.flush() sleep(timeout) if timeout < 64: