@@ -98,10 +98,13 @@ return $os } "sunos" { return "solaris" } + "noarch" - "none" - "any" - "all" { + return "noarch" + } } return -code error "Unable to normalize OS: $os" } @@ -112,10 +115,13 @@ "i?86" { return "ix86" } "x86_64" { return $cpu + } + "noarch" - "none" - "any" - "all" { + return "noarch" } } return -code error "Unable to normalize CPU: $cpu" } @@ -217,17 +223,21 @@ } set work [split $line ","] unset -nocomplain pkgInfo - set pkgInfo(package) [lindex $work 0] - set pkgInfo(version) [lindex $work 1] - set pkgInfo(os) [_normalizeOS [lindex $work 2]] - set pkgInfo(cpuArch) [_normalizeCPU [lindex $work 3]] - set pkgInfo(hash) [string tolower [lindex $work 4]] - set pkgInfo(hash_type) "sha1" - set pkgInfo(isLatest) [expr {!![lindex $work 5]}] + if {[catch { + set pkgInfo(package) [lindex $work 0] + set pkgInfo(version) [lindex $work 1] + set pkgInfo(os) [_normalizeOS [lindex $work 2]] + set pkgInfo(cpuArch) [_normalizeCPU [lindex $work 3]] + set pkgInfo(hash) [string tolower [lindex $work 4]] + set pkgInfo(hash_type) "sha1" + set pkgInfo(isLatest) [expr {!![lindex $work 5]}] + }]} { + continue + } if {![_isHash $pkgInfo(hash)]} { continue }