Revision

141288

Author

petr@macports.org

Date

2015-10-14 14:48:40 -0700 (Wed, 14 Oct 2015)

Log Message

py-pep8*: correct conflicts option

Modified Paths

• trunk/dports/python/py-pep8/Portfile
• trunk/dports/python/py-pep8-157/Portfile

Diff

--- trunk/dports/python/py-pep8/Portfile	2015-10-14 21:14:29 UTC (rev 141287)
+++ trunk/dports/python/py-pep8/Portfile	2015-10-14 21:48:40 UTC (rev 141288)
@@ -8,7 +8,6 @@
 set realname        pep8
 
 name                py-pep8
-conflicts           py-pep8-157
 
 version             1.6.2
 categories-append   devel
@@ -32,6 +31,8 @@
 python.versions     26 27 33 34
 
 if {${name} ne ${subport}} {
+    conflicts               py${python.version}-pep8-157
+
     depends_lib-append      port:py${python.version}-setuptools
     depends_run-append      port:${realname}_select
     select.group            ${realname}

--- trunk/dports/python/py-pep8-157/Portfile	2015-10-14 21:14:29 UTC (rev 141287)
+++ trunk/dports/python/py-pep8-157/Portfile	2015-10-14 21:48:40 UTC (rev 141288)
@@ -8,7 +8,6 @@
 set realname        pep8
 
 name                py-pep8-157
-conflicts           py-pep8
 
 version             1.5.7
 categories-append   devel
@@ -34,11 +33,14 @@
 python.versions     27 34
 
 if {${name} ne ${subport}} {
-    depends_lib-append      port:py${python.version}-setuptools
-    depends_run-append      port:${realname}_select
-    select.group            ${realname}
-    select.file             ${filespath}/${realname}${python.version}
+    conflicts           py${python.version}-pep8
 
+
+    depends_lib-append  port:py${python.version}-setuptools
+    depends_run-append  port:${realname}_select
+    select.group        ${realname}
+    select.file         ${filespath}/${realname}${python.version}
+
     # To fix the the version conflict between py-flake8 and py-pep8, #47429,
     # we need a clean corretion path, however py-pep8 and py-pep8-157 are 
     # conflicting.