X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=eacde3aa7eda581375a39ea13281259f0abdf120;hp=bebdf79f370f2869af534b220046dbb260217c64;hb=fe34dba430375e498ef46f82730795af229cee49;hpb=f276e170ffec2e6ee6e61b212fe8e1bd90279386

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index bebdf79..eacde3a 100755
--- 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 }
-	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 ?"
 	}
@@ -624,7 +630,7 @@ proc smash-code {code} {
 proc smash-prepare {} {
     global vc_codes smash_sizemap smash_size smash_sizeinexact
     set mapto {}
-    catch { unset smash_sizeplus }
+    catch { unset smash_sizeinexact }
     foreach size $vc_codes {
 	if {!$smash_size($size)} {
 	    set mapto $size