Bug#688121: unblock: libconfig-model-tkui-perl/1.337-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libconfig-model-tkui-perl
The current package has a confusing bug: the GUI shows configuration
values as modified even though they are not specified in the configuration
files. This patch also fixes a bug where wrong values or values with
warnings can be hidden from the user.
This patch was taken from upstream.
Thanks
unblock libconfig-model-tkui-perl/1.337-2
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru libconfig-model-tkui-perl-1.337/debian/changelog libconfig-model-tkui-perl-1.337/debian/changelog
--- libconfig-model-tkui-perl-1.337/debian/changelog 2012-06-29 14:26:50.000000000 +0200
+++ libconfig-model-tkui-perl-1.337/debian/changelog 2012-09-19 14:16:29.000000000 +0200
@@ -1,3 +1,9 @@
+libconfig-model-tkui-perl (1.337-2) unstable; urgency=low
+
+ * added upstream patch to fix green arrow display (Closes: #688097)
+
+ -- Dominique Dumont <dod@debian.org> Wed, 19 Sep 2012 14:14:17 +0200
+
libconfig-model-tkui-perl (1.337-1) unstable; urgency=low
* Imported Upstream version 1.337:
diff -Nru libconfig-model-tkui-perl-1.337/debian/patches/fix-green-arrow-and-show-hide.patch libconfig-model-tkui-perl-1.337/debian/patches/fix-green-arrow-and-show-hide.patch
--- libconfig-model-tkui-perl-1.337/debian/patches/fix-green-arrow-and-show-hide.patch 1970-01-01 01:00:00.000000000 +0100
+++ libconfig-model-tkui-perl-1.337/debian/patches/fix-green-arrow-and-show-hide.patch 2012-09-19 14:16:29.000000000 +0200
@@ -0,0 +1,40 @@
+Description: Fix green arrow and show hide.patch
+ This patch fixes the logic used to display the
+ green arrow.
+ Also don't hide values which have errors or warnings.
+ when
+ the 'show only custom values' checkbox is set.
+Bug-Debian: 688097
+Forwarded: yes
+Author: dod
+--- a/lib/Config/Model/TkUI.pm
++++ b/lib/Config/Model/TkUI.pm
+@@ -835,13 +835,15 @@
+ my $value = $leaf_object->fetch(check => 'no', silent => 1) ;
+ my $tkt = $cw->{tktree} ;
+
+- my ($is_customised, $img) ;
++ my ($is_customised, $img,$has_error,$has_warning) ;
+ {
+ no warnings qw/uninitialized/ ;
+- $is_customised = ! ( $std_v eq $value) ;
++ $is_customised = !! ( defined $value and ( $std_v ne $value )) ;
+ $img = $cust_img if $is_customised ;
+- $img = $warn_img if $leaf_object->warning_msg ;
+- $img = $error_img if $leaf_object->error_msg;
++ $has_warning = !! $leaf_object->warning_msg ;
++ $img = $warn_img if $has_warning ;
++ $has_error = !! $leaf_object->error_msg;
++ $img = $error_img if $has_error;
+ }
+
+ if (defined $img) {
+@@ -859,7 +861,7 @@
+
+ $tkt->itemCreate($path,3, -text => $cw->trim_value($std_v)) ;
+
+- my $meth = ($cw->{show_only_custom} and not $is_customised) ? 'hide' : 'show' ;
++ my $meth = ($cw->{show_only_custom} and not ($is_customised or $has_error or $has_warning)) ? 'hide' : 'show' ;
+ $tkt->$meth(entry => $path) ;
+ }
+
diff -Nru libconfig-model-tkui-perl-1.337/debian/patches/series libconfig-model-tkui-perl-1.337/debian/patches/series
--- libconfig-model-tkui-perl-1.337/debian/patches/series 2012-06-29 14:26:50.000000000 +0200
+++ libconfig-model-tkui-perl-1.337/debian/patches/series 2012-09-19 14:16:29.000000000 +0200
@@ -0,0 +1 @@
+fix-green-arrow-and-show-hide.patch
Reply to: