[65735] trunk/dports/python/py26-roman/Portfile

[jmr at macports.org]

Revision: 65735
          http://trac.macports.org/changeset/65735
Author:   jmr at macports.org
Date:     2010-03-30 16:32:40 -0700 (Tue, 30 Mar 2010)
Log Message:
-----------
py26-roman: fail in a less puzzling way in 1.8

Modified Paths:
--------------
    trunk/dports/python/py26-roman/Portfile

Modified: trunk/dports/python/py26-roman/Portfile
===================================================================
--- trunk/dports/python/py26-roman/Portfile	2010-03-30 23:15:56 UTC (rev 65734)
+++ trunk/dports/python/py26-roman/Portfile	2010-03-30 23:32:40 UTC (rev 65735)
@@ -25,7 +25,12 @@
     if {[file exists ${python.pkgd}/roman.py] 
         && ![catch {set vers [lindex [registry_active py26-docutils] 0]}]
         && [rpm-vercomp [lindex $vers 1] 0.6] < 0} {
-        registry_deactivate py26-docutils "" [list ports_nodepcheck 1]
+        # check for arbitrary 1.9 feature
+        if {[info exists negated_variants]} {
+            registry_deactivate py26-docutils "" [list ports_nodepcheck 1]
+        } else {
+            return -code error "py26-docutils [lindex $vers 1] conflicts with $name, please deactivate it first."
+        }
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100330/8e331ebd/attachment.html>