[98129] trunk/dports/python/py-pyqt4/files/patch-configure.py

[michaelld at macports.org]

Revision: 98129
          http://trac.macports.org//changeset/98129
Author:   michaelld at macports.org
Date:     2012-09-25 09:03:25 -0700 (Tue, 25 Sep 2012)
Log Message:
-----------
py*-pyqt4 : Change exception handling on "import license" to also handle when the license info is invalid.  Addresses ticket #35789.  No need to rev-bump for those without this issue.

Modified Paths:
--------------
    trunk/dports/python/py-pyqt4/files/patch-configure.py

Modified: trunk/dports/python/py-pyqt4/files/patch-configure.py
===================================================================
--- trunk/dports/python/py-pyqt4/files/patch-configure.py	2012-09-25 16:02:19 UTC (rev 98128)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py	2012-09-25 16:03:25 UTC (rev 98129)
@@ -1,5 +1,5 @@
---- configure.py.orig	2012-09-18 10:30:46.000000000 -0400
-+++ configure.py	2012-09-18 10:31:58.000000000 -0400
+--- configure.py.orig	2012-09-25 11:54:11.000000000 -0400
++++ configure.py	2012-09-25 11:55:51.000000000 -0400
 @@ -44,6 +44,7 @@
  qt_dir = None
  qt_incdir = None
@@ -49,6 +49,15 @@
      }
  
      sipconfig.create_config_module(module, template, content, macros)
+@@ -1787,7 +1785,7 @@
+             lfile = license.LicenseFile
+         except AttributeError:
+             lfile = None
+-    except ImportError:
++    except:
+         ltype = None
+ 
+     if ltype is None:
 @@ -1894,12 +1892,14 @@
      names = list(sipcfg.build_macros().keys())
      names.append("INCDIR_QT")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120925/d3a2e674/attachment.html>