Ticket #18794: conflicts.diff

src/port1.0/portmain.tcl

@@ -42 +42 @@
 
 # define options
 options prefix macportsuser name version revision epoch categories maintainers
-options long_description description homepage
+options long_description description homepage conflicts
 options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group macosx_deployment_target
 options universal_variant os.universal_supported
 
@@ -70 +70 @@
 default worksrcdir {$distname}
 default filespath {[file join $portpath $filesdir]}
 default worksrcpath {[file join $workpath $worksrcdir]}
+default conflicts {}
 
 # Configure settings
 default macportsuser {${portutil::autoconf::macportsuser}}

src/macports1.0/macports.tcl

@@ -1331 +1331 @@
     }
 }
 
+### _mportconflictsinstalled is private; may change without notice
+
+# Determine if the port, per the conflicts option, has any conflicts with
+# what is installed.
+#
+# mport   the port to check for conflicts
+# Returns a list of which installed ports conflict, or an empty list if none
+proc _mportconflictsinstalled {mport} {
+    set conflictlist {}
+    set conflictinfo [_mportkey $mport conflicts]
+    if {[llength $conflictinfo] > 0} {
+        ui_debug "Checking for conflicts against [_mportkey $mport name]"
+        foreach conflictspec ${conflictinfo} {
+            switch -regex $conflictspec {
+                ^port:([-._A-Za-z0-9]+)$ {
+                    set conflict_portname [lindex [split $conflictspec :] end]
+                    set conflict_portinfo [mportlookup $conflict_portname]
+                    array set portinfo [lindex $conflict_portinfo 1]
+                    set conflict_port [mportopen $portinfo(porturl)]
+                    if {[string equal ${macports::registry.installtype} "image"]} {
+                        if {[_mportactive $conflict_port]} {
+                            lappend conflictlist $conflict_portname
+                        }
+                    } else {
+                        if {[_mportinstalled $conflict_port]} {
+                            lappend conflictlist $conflict_portname
+                        }
+                    }
+                }
+                default {
+                    return -code error [format [msgcat::mc "invalid conflictspec: %s"] $conflictspec]
+                }
+            }
+        }
+    } else {
+        ui_debug "[_mportkey $mport name] has no conflicts"
+    }
+
+    return $conflictlist
+}
+
+
 ### _mportexec is private; may change without notice
 
 proc _mportexec {target mport} {
@@ -1388 +1430 @@
         || $target == "rpm" || $target == "dpkg" 
         || $target == "srpm"|| $target == "portpkg" } {
 
+        set conflictports [_mportconflictsinstalled $mport]
+        if {[llength ${conflictports}] != 0} {
+            return -code error "Can't install [_mportkey $mport name] because conflicting ports are installed: ${conflictports}"
+        }
+
         ui_msg -nonewline "--->  Computing dependencies for [_mportkey $mport name]"
         if {[macports::ui_isset ports_debug]} {
             # play nice with debug messages