chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
where-vessels: correctly display now-unsmashed but previously-smashed sizes
[ypp-sc-tools.db-test.git]
/
yarrg
/
where-vessels
diff --git
a/yarrg/where-vessels
b/yarrg/where-vessels
index bebdf79f370f2869af534b220046dbb260217c64..eacde3aa7eda581375a39ea13281259f0abdf120 100755
(executable)
--- a/
yarrg/where-vessels
+++ b/
yarrg/where-vessels
@@
-147,7
+147,13
@@
proc argdefaults {} {
set cmd {./yarrg --find-window-only --quiet}
if {[info exists ocean]} { lappend cmd --ocean $ocean }
if {[info exists pirate]} { lappend cmd --pirate $pirate }
set cmd {./yarrg --find-window-only --quiet}
if {[info exists ocean]} { lappend cmd --ocean $ocean }
if {[info exists pirate]} { lappend cmd --pirate $pirate }
- manyset [split [eval exec $cmd] " "] ocean pirate
+ if {[catch {
+ manyset [split [eval exec $cmd] " "] ocean pirate
+ } emsg]} {
+ puts stderr "yarrg: [string trim $emsg]"
+ puts stderr "Alternatively pass, --ocean and perhaps --pirate options to where-vessels"
+ exit 1
+ }
if {![llength $ocean] || ![llength $pirate]} {
error "$ocean $pirate ?"
}
if {![llength $ocean] || ![llength $pirate]} {
error "$ocean $pirate ?"
}
@@
-624,7
+630,7
@@
proc smash-code {code} {
proc smash-prepare {} {
global vc_codes smash_sizemap smash_size smash_sizeinexact
set mapto {}
proc smash-prepare {} {
global vc_codes smash_sizemap smash_size smash_sizeinexact
set mapto {}
- catch { unset smash_size
plus
}
+ catch { unset smash_size
inexact
}
foreach size $vc_codes {
if {!$smash_size($size)} {
set mapto $size
foreach size $vc_codes {
if {!$smash_size($size)} {
set mapto $size