* tkcon.tcl (tkcon::Retrieve): correct the check for tkcon version

	when retrieving from http.

diff --git a/ChangeLog b/ChangeLog
index 659a96ec8bc03e5a4caf01a5df49edb7cf2b30b8..43c8efd1183bf7565cc4f8281c0d97c7d17481bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-31  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl (tkcon::Retrieve): correct the check for tkcon version
+       when retrieving from http.
+
 2003-02-20  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (EvalCmd): set $:: (aka ${}) var to last command result.

diff --git a/tkcon.tcl b/tkcon.tcl
index f72e6fbc34f689074d88a150eb4eb4bc18192abd..21450fdcdb6b6792e3dcbee3664de04f8c7cc95d 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -74,6 +74,8 @@ foreach cmd {SetCursor UpDownLine Transpose ScrollPages} {
 # Initialize the ::tkcon namespace
 #
 namespace eval ::tkcon {
+    # when modifying this line, make sure that the auto-upgrade check
+    # for version still works.
     variable VERSION "2.4"
     # The OPT variable is an array containing most of the optional
     # info to configure.  COLOR has the color data.
@@ -5275,20 +5277,24 @@ proc ::tkcon::Retrieve {} {
                puts -nonewline $fid $data
                close $fid
                regexp {Id: tkcon.tcl,v (\d+\.\d+)} $data -> rcsVersion
-               regexp {version\s+(\d+\.\d[^\n]*)} $data -> tkconVersion
+               regexp {VERSION\s+"(\d+\.\d+[^\"]*)"} $data -> tkconVersion
            }
        } err]
        ::http::cleanup $token
        if {$code} {
            return -code error $err
-       } elseif {[tk_messageBox -type yesno -icon info -parent $PRIV(root) \
-               -title "Retrieved tkcon v$tkconVersion, RCS $rcsVersion" \
-               -message "Successfully retrieved tkcon v$tkconVersion,\
-               RCS $rcsVersion.  Shall I resource (not restart) this\
-               version now?"] == "yes"} {
-           set PRIV(SCRIPT) $file
-           set PRIV(version) $tkconVersion.$rcsVersion
-           ::tkcon::Resource
+       } else {
+           if {![info exists rcsVersion]}   { set rcsVersion   "UNKNOWN" }
+           if {![info exists tkconVersion]} { set tkconVersion "UNKNOWN" }
+           if {[tk_messageBox -type yesno -icon info -parent $PRIV(root) \
+                   -title "Retrieved tkcon v$tkconVersion, RCS $rcsVersion" \
+                   -message "Successfully retrieved tkcon v$tkconVersion,\
+                   RCS $rcsVersion.  Shall I resource (not restart) this\
+                   version now?"] == "yes"} {
+               set PRIV(SCRIPT) $file
+               set PRIV(version) $tkconVersion.$rcsVersion
+               ::tkcon::Resource
+           }
        }
     }
 }