Ticket #8763: regclean.diff

src/port/port.tcl

@@ -2063 +2063 @@
 }
 
 
+proc action_regclean { action portlist opts } {
+    # Clean up the registry. Currently this just means removing duplicate
+    # dep_map entries.
+    registry::open_dep_map
+    registry::clean_dep_map
+    registry::write_dep_map
+    
+    return 0
+}
+
+
 proc action_portcmds { action portlist opts } {
     # Operations on the port's directory and Portfile
     global env boot_env
@@ -2348 +2359 @@
     search      action_search
     list        action_list
     
+    regclean    action_regclean
+    
     ed          action_portcmds
     edit        action_portcmds
     cat         action_portcmds

src/registry1.0/receipt_flat.tcl

@@ -750 +750 @@
         set dep_map $new_map
 }
 
+# remove duplicate entries from the dep_map
+# (could be put there by older versions of MacPorts)
+proc clean_dep_map {args} {
+    variable dep_map
+    set new_map [list]
+    set oldlen [llength $dep_map]
+    ui_debug "Current dep_map has $oldlen entries"
+    foreach de $dep_map {
+        if {[lsearch -exact $new_map $de] == -1} {
+            lappend new_map $de
+        } else {
+            ui_debug "Removing $de from dep_map"
+        }
+    }
+    set dep_map $new_map
+    
+    set newlen [llength $dep_map]
+    set diff [expr $oldlen - $newlen]
+    ui_debug "New dep_map has $newlen entries"
+    ui_info "Removed $diff duplicate entries from the dependency map"
+}
+
 proc write_dep_map {args} {
         global macports::registry.path
         variable dep_map

src/registry1.0/registry.tcl

@@ -370 +370 @@
         return [${macports::registry.format}::unregister_dep $dep $type $port]
 }
 
+proc clean_dep_map {args} {
+    global macports::registry.format
+    return [${macports::registry.format}::clean_dep_map $args]
+}
+
 proc write_dep_map {args} {
         global macports::registry.format
         return [${macports::registry.format}::write_dep_map $args]