From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 20 17:24:05 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 42A3550F;
 Wed, 20 Feb 2013 17:24:05 +0000 (UTC) (envelope-from dbn@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 2B2E734A;
 Wed, 20 Feb 2013 17:24:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1KHO5te058901;
 Wed, 20 Feb 2013 17:24:05 GMT (envelope-from dbn@svn.freebsd.org)
Received: (from dbn@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1KHO5RD058900;
 Wed, 20 Feb 2013 17:24:05 GMT (envelope-from dbn@svn.freebsd.org)
Message-Id: <201302201724.r1KHO5RD058900@svn.freebsd.org>
From: David Naylor <dbn@FreeBSD.org>
Date: Wed, 20 Feb 2013 17:24:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312630 - head/devel/eric4/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Feb 2013 17:24:05 -0000

Author: dbn
Date: Wed Feb 20 17:24:04 2013
New Revision: 312630
URL: http://svnweb.freebsd.org/changeset/ports/312630

Log:
  Fix installation of devel/eric4 when stdin is closed.
  
  The installation asks the user a question, but if stdin is closed an EOFError is
  thrown and installation fails.  The patch fixes this by assuming "no" to the
  question.
  
  The install script asks the user about modifying PyXML, an external file to
  eric4, thus answering "no" is the appropriate answer in the absence of user
  judgement.
  
  Approved by:	eadler (mentor), bsam (maintainer)

Added:
  head/devel/eric4/files/patch-install.py   (contents, props changed)

Added: head/devel/eric4/files/patch-install.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/eric4/files/patch-install.py	Wed Feb 20 17:24:04 2013	(r312630)
@@ -0,0 +1,11 @@
+--- install.py~	2013-02-18 20:06:18.000000000 +0200
++++ install.py	2013-02-18 20:07:37.000000000 +0200
+@@ -1030,7 +1030,7 @@
+                 res = raw_input("    Shall pyXML be patched now (y/n)? ")
+                 if res in ["Y", "y"]:
+                     patchPyXML()
+-    except ImportError:
++    except (ImportError, EOFError):
+         pass
+     
+     #check version of PyQt