diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-08-03 16:05:44 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-08-03 16:05:44 +0000 |
| commit | d3989619f6e0c8bb1f759efbf08b9c948f6f9bb8 (patch) | |
| tree | ec195c800bf66c8cff22bb05dfedb6271e717f57 /Rpmdrake/pkg.pm | |
| parent | 562d9102c2a35e74fbc590163dbcac7df415d29d (diff) | |
| download | rpmdrake-d3989619f6e0c8bb1f759efbf08b9c948f6f9bb8.tar rpmdrake-d3989619f6e0c8bb1f759efbf08b9c948f6f9bb8.tar.gz rpmdrake-d3989619f6e0c8bb1f759efbf08b9c948f6f9bb8.tar.bz2 rpmdrake-d3989619f6e0c8bb1f759efbf08b9c948f6f9bb8.tar.xz rpmdrake-d3989619f6e0c8bb1f759efbf08b9c948f6f9bb8.zip | |
(get_pkgs) do not mask earlier declaration in same scope (cosmetic)
Diffstat (limited to 'Rpmdrake/pkg.pm')
| -rwxr-xr-x | Rpmdrake/pkg.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 6537eab1..befb2e09 100755 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -248,7 +248,7 @@ sub get_pkgs { my $w = $::main_window; Rpmdrake::gurpm::init(1 ? N("Please wait") : N("Package installation..."), N("Initializing..."), transient => $::main_window); - my $_guard = before_leaving { Rpmdrake::gurpm::end() }; + my $_gurpm_clean_guard = before_leaving { Rpmdrake::gurpm::end() }; my $_flush_guard = Gtk2::GUI_Update_Guard->new; my $urpm = open_urpmi_db(); @@ -533,7 +533,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( scroll => 1, yesno => 1) or return 1; - my $_guard = before_leaving { urpm::removable::try_umounting_removables($urpm) }; + my $_umount_guard = before_leaving { urpm::removable::try_umounting_removables($urpm) }; # select packages to uninstall for !update mode: perform_removal($urpm, { map { $_ => $pkgs->{$_} } @to_remove }) if !$probe_only_for_updates; |