summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-11-17 16:44:02 +0000
committerThierry Vignaud <tv@mageia.org>2012-11-17 16:44:02 +0000
commitbbd00a59ec497f3915975684646c983597f8d6c0 (patch)
treea18c239a3dc5c59bc8b6490dba1d0f60d1883192
parent0084b6ba0d204711f23a4d98984cf90c4178096f (diff)
downloadurpmi-bbd00a59ec497f3915975684646c983597f8d6c0.tar
urpmi-bbd00a59ec497f3915975684646c983597f8d6c0.tar.gz
urpmi-bbd00a59ec497f3915975684646c983597f8d6c0.tar.bz2
urpmi-bbd00a59ec497f3915975684646c983597f8d6c0.tar.xz
urpmi-bbd00a59ec497f3915975684646c983597f8d6c0.zip
(_schedule_packages) fix installing delta rpms
got broken in commit r6466 on 2012-11-16: "(_apply_delta_rpm) split it out of _schedule_packages()"
-rw-r--r--NEWS2
-rw-r--r--urpm/install.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 34cc385e..84c9620a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix installing delta rpms
+
Version 7.11 - 16 November 2012, by Thierry Vignaud
- library:
diff --git a/urpm/install.pm b/urpm/install.pm
index 283fc877..fde09cdb 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -213,7 +213,7 @@ sub _schedule_packages {
$pkg->update_header($mode->{$_}, keep_all_tags => 1);
my ($true_rpm, $true_pkg);
if ($pkg->payload_format eq 'drpm') { #- handle deltarpms
- ($true_rpm, $true_pkg) = _apply_delta_rpm($urpm, $_, $mode, $pkg);
+ ($true_rpm, $true_pkg) = _apply_delta_rpm($urpm, $mode->{$_}, $mode, $pkg);
push @produced_deltas, ($mode->{$_} = $true_rpm); #- fix path
}
if ($trans->add($true_pkg || $pkg, update => $update,