From: | "Markos Chandras (hwoarang)" <hwoarang@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-python/PyQt4/files: fix_license_check.patch |
Date: | Mon, 01 Jun 2009 19:33:36 |
Message-Id: | E1MBDGI-0004FO-Ou@stork.gentoo.org |
1 | hwoarang 09/06/01 19:33:34 |
2 | |
3 | Added: fix_license_check.patch |
4 | Log: |
5 | Add missing patch. Fixes bug 272126 |
6 | (Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.1 dev-python/PyQt4/files/fix_license_check.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/fix_license_check.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/fix_license_check.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: fix_license_check.patch |
15 | =================================================================== |
16 | Index: configure.py |
17 | =================================================================== |
18 | --- configure.py |
19 | +++ configure.py |
20 | @@ -1469,7 +1469,8 @@ def check_license(): |
21 | # Common checks. |
22 | if qt_edition and ltype != "internal": |
23 | if qt_edition != "free" and ltype == "GPL": |
24 | - sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition) |
25 | + if qt_edition != "Desktop": |
26 | + sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition) |
27 | |
28 | # Confirm the license if not already done. |
29 | if not opts.license_confirmed: |