Changeset 39116 for trunk/base/src

Timestamp:

08/08/08 09:12:16 (4 months ago)

Author:

jmr@…

Message:

Add clean_dep_map proc to registry, for removing duplicate dependency entries. (See #8763)

Location:

trunk/base/src/registry1.0

Files:

• receipt_flat.tcl (modified) (1 diff)
• registry.tcl (modified) (1 diff)

trunk/base/src/registry1.0/receipt_flat.tcl

@@ -764 +764 @@
 }
 
+# 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

trunk/base/src/registry1.0/registry.tcl

@@ -371 +371 @@
 }
 
+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