aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xRpmdrake/formatting.pm2
-rwxr-xr-xRpmdrake/pkg.pm5
2 files changed, 4 insertions, 3 deletions
diff --git a/Rpmdrake/formatting.pm b/Rpmdrake/formatting.pm
index 52583087..e3de5fb5 100755
--- a/Rpmdrake/formatting.pm
+++ b/Rpmdrake/formatting.pm
@@ -88,7 +88,7 @@ sub pkg2medium {
#- as to_utf8() uses LC_CTYPE for locale encoding and strftime() uses LC_TIME,
#- it doesn't work if those two variables have values with different
#- encodings; but if a user has a so broken setup we can't do much anyway
-sub localtime2changelog { to_utf8(strftime("%c", localtime($_[0]))) }
+sub localtime2changelog { to_utf8(POSIX::strftime("%c", localtime($_[0]))) }
sub format_header {
my ($str) = @_;
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index d99ee2bd..1d1cca5a 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -492,7 +492,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
Rpmdrake::gurpm::init(1 ? N("Please wait") : N("Package installation..."), N("Initializing..."), transient => $::w->{real_window});
my $distant_progress;
my $canceled;
- my %sources = $urpm->download_source_packages(
+ my %sources = urpm::download_source_packages(
+ $urpm,
$local_sources,
$list,
force_local => 1, # removed in urpmi 4.8.7
@@ -521,7 +522,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
$canceled and goto return_with_error;
Rpmdrake::gurpm::invalidate_cancel_forever();
- my %sources_install = %{$urpm->extract_packages_to_install(\%sources, $urpm->{rpmdrake_state}) || {}};
+ my %sources_install = %{urpm::extract_packages_to_install($urpm, \%sources, $urpm->{rpmdrake_state}) || {}};
my @rpms_install = grep { !/\.src\.rpm$/ } values %sources_install;
my @rpms_upgrade = grep { !/\.src\.rpm$/ } values %sources;