diff --git a/src/bootsupport/modules/punk/tdl-0.1.0.tm b/src/bootsupport/modules/punk/tdl-0.1.0.tm index 6b1480be..431c979e 100644 --- a/src/bootsupport/modules/punk/tdl-0.1.0.tm +++ b/src/bootsupport/modules/punk/tdl-0.1.0.tm @@ -50,8 +50,7 @@ namespace eval punk::tdl { # $i invokehidden namespace delete {*}[$i invokehidden namespace children] $i alias unknown apply {{i tag args} { upvar 1 result result - set e [concat [list tag $tag]\ - [lrange $args 0 [expr {([llength $args] & ~1) - 1}]]] + set e [concat [list tag $tag] [lrange $args 0 [expr {([llength $args] & ~1) - 1}]]] if {[llength $args] % 2} { set saved $result set result {} diff --git a/src/bootsupport/modules/punkcheck-0.1.0.tm b/src/bootsupport/modules/punkcheck-0.1.0.tm index c286d765..4fdc3349 100644 --- a/src/bootsupport/modules/punkcheck-0.1.0.tm +++ b/src/bootsupport/modules/punkcheck-0.1.0.tm @@ -2085,6 +2085,10 @@ namespace eval punkcheck { foreach rec $record_list { if {[dict get $rec tag] eq "FILEINFO"} { set tgtlist [dict get $rec -targets] + if {[dict exists $result $tgtlist]} { + #todo - warn - duplicate record for same targetlist - shouldn't happen as we should be using get_file_record to find existing records + error "punkcheck::recordlist::records_as_target_dict - multiple records with same targetlist '$tgtlist'" + } dict set result $tgtlist $rec } } @@ -2092,8 +2096,6 @@ namespace eval punkcheck { } - - #will only match if same base was used.. and same targetlist proc get_file_record {targetlist record_list} { set posn 0 @@ -2349,12 +2351,12 @@ namespace eval punkcheck { } #extract new or existing filerecord for path given - #review - locking/concurrency + #REVIEW - locking/concurrency proc extract_or_create_fileset_record {relative_target_paths recordset} { set fetch_record_result [punkcheck::recordlist::get_file_record $relative_target_paths $recordset] set existing_posn [dict get $fetch_record_result position] if {$existing_posn == -1} { - #puts stdout "NO existing record for $relative_target_paths" + puts stdout "punkcheck NO existing record for $relative_target_paths" set isnew 1 set fileset_record [dict create tag FILEINFO -targets $relative_target_paths body {}] } else { diff --git a/src/modules/punk/tdl-999999.0a1.0.tm b/src/modules/punk/tdl-999999.0a1.0.tm index 389c52f3..e4d20d6c 100644 --- a/src/modules/punk/tdl-999999.0a1.0.tm +++ b/src/modules/punk/tdl-999999.0a1.0.tm @@ -50,8 +50,7 @@ namespace eval punk::tdl { # $i invokehidden namespace delete {*}[$i invokehidden namespace children] $i alias unknown apply {{i tag args} { upvar 1 result result - set e [concat [list tag $tag]\ - [lrange $args 0 [expr {([llength $args] & ~1) - 1}]]] + set e [concat [list tag $tag] [lrange $args 0 [expr {([llength $args] & ~1) - 1}]]] if {[llength $args] % 2} { set saved $result set result {} diff --git a/src/modules/punkcheck-0.1.0.tm b/src/modules/punkcheck-0.1.0.tm index c286d765..4fdc3349 100644 --- a/src/modules/punkcheck-0.1.0.tm +++ b/src/modules/punkcheck-0.1.0.tm @@ -2085,6 +2085,10 @@ namespace eval punkcheck { foreach rec $record_list { if {[dict get $rec tag] eq "FILEINFO"} { set tgtlist [dict get $rec -targets] + if {[dict exists $result $tgtlist]} { + #todo - warn - duplicate record for same targetlist - shouldn't happen as we should be using get_file_record to find existing records + error "punkcheck::recordlist::records_as_target_dict - multiple records with same targetlist '$tgtlist'" + } dict set result $tgtlist $rec } } @@ -2092,8 +2096,6 @@ namespace eval punkcheck { } - - #will only match if same base was used.. and same targetlist proc get_file_record {targetlist record_list} { set posn 0 @@ -2349,12 +2351,12 @@ namespace eval punkcheck { } #extract new or existing filerecord for path given - #review - locking/concurrency + #REVIEW - locking/concurrency proc extract_or_create_fileset_record {relative_target_paths recordset} { set fetch_record_result [punkcheck::recordlist::get_file_record $relative_target_paths $recordset] set existing_posn [dict get $fetch_record_result position] if {$existing_posn == -1} { - #puts stdout "NO existing record for $relative_target_paths" + puts stdout "punkcheck NO existing record for $relative_target_paths" set isnew 1 set fileset_record [dict create tag FILEINFO -targets $relative_target_paths body {}] } else {