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

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index da64801..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 ?"
 	}
@@ -474,7 +480,7 @@ proc show-report-decode {code} {
 	    1 { report-set own "Other pirate's" }
 	    2 { report-set own "Owner unknown" }
 	    3 { report-set own "(All ownerships)" }
-	    4 - 5 { report-set own "(Yours/unknown)" }
+	    4 - 5 { report-set own "(Not yours / unknown)" }
 	    default { report-set own "?? $notown" }
 	}
     }
@@ -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