gitk: Report errors in saving config file

max630 · paulusmack · commit 1dd29606b692 · 2015-03-15T14:14:22.000+11:00
Signed-off-by: Max Kirillov &lt;max@max630.net&gt;
Signed-off-by: Paul Mackerras &lt;paulus@samba.org&gt;
diff --git a/gitk b/gitk
@@ -2818,7 +2818,7 @@ proc savestuff {w} {
 
     if {$stuffsaved} return
     if {![winfo viewable .]} return
-    catch {
+    if {[catch {
 	if {[file exists $config_file_tmp]} {
 	    file delete -force $config_file_tmp
 	}
@@ -2884,6 +2884,8 @@ proc savestuff {w} {
 	puts $f "}"
 	close $f
 	file rename -force $config_file_tmp $config_file
+    } err]} {
+        puts "Error saving config: $err"
     }
     set stuffsaved 1
 }

Original file line number	Diff line number	Diff line change
`@@ -2818,7 +2818,7 @@ proc savestuff {w} {`
`2818`	`2818`
`2819`	`2819`	`if {$stuffsaved} return`
`2820`	`2820`	`if {![winfo viewable .]} return`
`2821`		`- catch {`
	`2821`	`+ if {[catch {`
`2822`	`2822`	`if {[file exists $config_file_tmp]} {`
`2823`	`2823`	`file delete -force $config_file_tmp`
`2824`	`2824`	`}`
`@@ -2884,6 +2884,8 @@ proc savestuff {w} {`
`2884`	`2884`	`puts $f "}"`
`2885`	`2885`	`close $f`
`2886`	`2886`	`file rename -force $config_file_tmp $config_file`
	`2887`	`+ } err]} {`
	`2888`	`+ puts "Error saving config: $err"`
`2887`	`2889`	`}`
`2888`	`2890`	`set stuffsaved 1`
`2889`	`2891`	`}`