Changeset 98129

Timestamp:

Sep 25, 2012, 4:03:25 PM (12 years ago)

Author:

michaelld@…

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.

File:

• trunk/dports/python/py-pyqt4/files/patch-configure.py (modified) (2 diffs)

trunk/dports/python/py-pyqt4/files/patch-configure.py

@@ -1 @@
---- 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
@@ -50 +50 @@
  
      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())