diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-09-21 16:16:14 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-09-21 16:16:14 +0000 |
commit | 1fc0f1af3e7056ce5f860b237f5d846caa6b586d (patch) | |
tree | 194e871d6b85dc08c62b6802f68fc5a1c21a87fe /rpmdrake | |
parent | cd16428d8f27757bd469e34bc2fb98a1c55de996 (diff) | |
download | rpmdrake-1fc0f1af3e7056ce5f860b237f5d846caa6b586d.tar rpmdrake-1fc0f1af3e7056ce5f860b237f5d846caa6b586d.tar.gz rpmdrake-1fc0f1af3e7056ce5f860b237f5d846caa6b586d.tar.bz2 rpmdrake-1fc0f1af3e7056ce5f860b237f5d846caa6b586d.tar.xz rpmdrake-1fc0f1af3e7056ce5f860b237f5d846caa6b586d.zip |
make failing to open RPM DB non fatal when reseting selection (mga#7352)
(backported from trunk)
Diffstat (limited to 'rpmdrake')
-rwxr-xr-x | rpmdrake | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -550,8 +550,13 @@ sub run_treeview_dialog { ), [ N("/_File") . N("/_Reset the selection"), undef, sub { if ($MODE ne 'remove') { + my $db = eval { open_rpm_db() }; + if (!ref($db)) { + statusbar_msg(N("Reset aborted (RPM DB is locked by another process)"), 1); + return; + }; $urpm->disable_selected( - open_rpm_db(), $urpm->{state}, + $db, $urpm->{state}, map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{pkg}) } keys %$pkgs, ); } |