aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-13 22:20:28 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-13 22:20:36 +0100
commit064e65870416fa7fc640937a66b38eedb3f00d4a (patch)
treeea100f396575c8ba60b0b35a44fa0d76df96be71
parent6a58fa797bb367a5283621c07bfe575b66023df9 (diff)
downloadrpmdrake-064e65870416fa7fc640937a66b38eedb3f00d4a.tar
rpmdrake-064e65870416fa7fc640937a66b38eedb3f00d4a.tar.gz
rpmdrake-064e65870416fa7fc640937a66b38eedb3f00d4a.tar.bz2
rpmdrake-064e65870416fa7fc640937a66b38eedb3f00d4a.tar.xz
rpmdrake-064e65870416fa7fc640937a66b38eedb3f00d4a.zip
fix a crash when trying to debug an old issue (mga#8967)
it's stupid to crash when trying to do so...
-rw-r--r--NEWS3
-rw-r--r--Rpmdrake/gui.pm9
2 files changed, 11 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1e6ee945..795adfa2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- rpmdrake:
+ o fix a crash when trying to debug an old issue (mga#8967)
+
Version 6.7 - 6 January 2014, Thierry Vignaud
- --merge-all-rpmnew mode:
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index e10629ac..29724779 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -384,7 +384,14 @@ sub node_state {
return 'XXX' if !$name;
my $pkg = $pkgs->{$name};
my $urpm_obj = $pkg->{pkg};
- return warn_if_no_pkg($name) if !$urpm_obj;
+ if (!$urpm_obj) {
+ my $res = eval { warn_if_no_pkg($name) };
+ if (my $err = $@) {
+ warn "ERROR: $err\n";
+ log::explanations("ERROR: $err");
+ }
+ return $res;
+ }
$pkg->{selected} ?
($urpm_obj->flag_installed ?
($urpm_obj->flag_upgrade ? 'to_install' : 'to_remove')