aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake/gui.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-03-22 23:27:59 +0000
committerThierry Vignaud <tv@mandriva.org>2007-03-22 23:27:59 +0000
commit4b734e511a10adc654a398304a779d9ede75fd14 (patch)
treebf0d800098d6069af5b200662c6721300a1a3d30 /Rpmdrake/gui.pm
parentd63f1a4fd652bef657be2afc70f500777023f9a6 (diff)
downloadrpmdrake-4b734e511a10adc654a398304a779d9ede75fd14.tar
rpmdrake-4b734e511a10adc654a398304a779d9ede75fd14.tar.gz
rpmdrake-4b734e511a10adc654a398304a779d9ede75fd14.tar.bz2
rpmdrake-4b734e511a10adc654a398304a779d9ede75fd14.tar.xz
rpmdrake-4b734e511a10adc654a398304a779d9ede75fd14.zip
revert r57586:57588, aka do not keep around the rpm db opened, thus making mcc closable again in mcc (#26069)
Diffstat (limited to 'Rpmdrake/gui.pm')
-rw-r--r--Rpmdrake/gui.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 1ae979dc..daa39bb8 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -458,7 +458,7 @@ sub closure_removal {
sub is_locale_available {
any { $urpm->{depslist}[$_]->flag_selected } keys %{$urpm->{provides}{$_[0]} || {}} and return 1;
my $found;
- $db->traverse_tag('name', [ $_ ], sub { $found ||= 1 });
+ open_db()->traverse_tag('name', [ $_ ], sub { $found ||= 1 });
return $found;
}
@@ -574,7 +574,7 @@ sub toggle_nodes {
$widget,
sub {
@requested = $urpm->resolve_requested(
- $db, $urpm->{state},
+ open_db(), $urpm->{state},
{ map { $pkgs->{$_}{pkg}->id => 1 } @nodes },
callback_choices => \&callback_choices,
);
@@ -585,7 +585,7 @@ sub toggle_nodes {
N("To satisfy dependencies, the following package(s) also need\nto be installed:\n\n"),
\@nodes, \@nodes_with_deps)) {
@nodes_with_deps = ();
- $urpm->disable_selected($db, $urpm->{state}, @requested);
+ $urpm->disable_selected(open_db(), $urpm->{state}, @requested);
goto packages_selection_ok;
}
@@ -615,14 +615,14 @@ sub toggle_nodes {
} else {
my @unrequested;
slow_func($widget,
- sub { @unrequested = $urpm->disable_selected($db, $urpm->{state},
+ sub { @unrequested = $urpm->disable_selected(open_db(), $urpm->{state},
map { $pkgs->{$_}{pkg} } @nodes) });
@nodes_with_deps = map { urpm_name($_) } @unrequested;
if (!$deps_msg->(N("Some packages need to be removed"),
N("Because of their dependencies, the following package(s) must be\nunselected now:\n\n"),
\@nodes, \@nodes_with_deps)) {
@nodes_with_deps = ();
- $urpm->resolve_requested($db, $urpm->{state}, { map { $_->id => 1 } @unrequested });
+ $urpm->resolve_requested(open_db(), $urpm->{state}, { map { $_->id => 1 } @unrequested });
goto packages_unselection_ok;
}
packages_unselection_ok: