aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-11 14:56:01 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-11 14:56:01 +0000
commit7318144585dce9df6bbce4e7d87ccf4ca4d26654 (patch)
tree23160de271e71826c0e5b52bd674093b2fe24918
parent95dd67c5e963f009acdf0721ababe77adfa6d050 (diff)
downloadrpmdrake-7318144585dce9df6bbce4e7d87ccf4ca4d26654.tar
rpmdrake-7318144585dce9df6bbce4e7d87ccf4ca4d26654.tar.gz
rpmdrake-7318144585dce9df6bbce4e7d87ccf4ca4d26654.tar.bz2
rpmdrake-7318144585dce9df6bbce4e7d87ccf4ca4d26654.tar.xz
rpmdrake-7318144585dce9df6bbce4e7d87ccf4ca4d26654.zip
perl_checker cleanups
-rw-r--r--Rpmdrake/pkg.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index a1627baf..bb20caa5 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -156,7 +156,7 @@ sub open_rpm_db {
}
URPM::DB::open($dblocation) or die "Couldn't open RPM DB";
} else {
- URPM::DB::open($::rpmdrake_options{'rpm-root'}->[0]) or die "Couldn't open RPM DB ($::rpmdrake_options{'rpm-root'}->[0])";
+ URPM::DB::open($::rpmdrake_options{'rpm-root'}[0]) or die "Couldn't open RPM DB ($::rpmdrake_options{'rpm-root'}[0])";
}
}
@@ -237,9 +237,9 @@ sub open_urpmi_db() {
$urpm->{options}{'split-level'} ||= 20;
$urpm->{options}{'split-length'} ||= 1;
$urpm->{options}{'verify-rpm'} = !$::rpmdrake_options{'no-verify-rpm'} if defined $::rpmdrake_options{'no-verify-rpm'};
- $urpm->{options}{auto} = $::rpmdrake_options{'auto'} if defined $::rpmdrake_options{'auto'};
- urpm::set_files($urpm, $::rpmdrake_options{'urpmi-root'}->[0]) if $::rpmdrake_options{'urpmi-root'}->[0];
- urpm::args::set_root($urpm, $::rpmdrake_options{'rpm-root'}->[0]) if $::rpmdrake_options{'rpm-root'}->[0];
+ $urpm->{options}{auto} = $::rpmdrake_options{auto} if defined $::rpmdrake_options{auto};
+ urpm::set_files($urpm, $::rpmdrake_options{'urpmi-root'}[0]) if $::rpmdrake_options{'urpmi-root'}[0];
+ urpm::args::set_root($urpm, $::rpmdrake_options{'rpm-root'}[0]) if $::rpmdrake_options{'rpm-root'}[0];
$urpm::args::rpmdrake_options{justdb} = $::rpmdrake_options{justdb};
@@ -558,7 +558,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my $install_count = int(@pkgs);
my $to_install = $install_count == 0 ? '' :
- ( P("The following package is going to be installed:", "The following %d packages are going to be installed:", $install_count, $install_count)
+ (P("The following package is going to be installed:", "The following %d packages are going to be installed:", $install_count, $install_count)
. "\n" . formatlistpkg(map { s!.*/!!; $_ } @pkgs) . "\n");
my $remove_count = scalar(@to_remove);
interactive_msg(($to_install ? N("Confirmation") : N("Some packages need to be removed")),
@@ -593,7 +593,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
} elsif (defined $pkg) {
$something_installed = 1;
Rpmdrake::gurpm::label(N("Installing package `%s' (%s/%s)...", $pkg->name, ++$transaction_progress_nb, scalar(@{$transaction->{upgrade}}))
- . "\n" .N("Total: %s/%s", ++$progress_nb, $install_count));
+ . "\n" . N("Total: %s/%s", ++$progress_nb, $install_count));
}
} elsif ($subtype eq 'progress') {
Rpmdrake::gurpm::progress($total ? $amount/$total : 1);