From 377d39737813c83eb8dd6a346c31e18b84917590 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 16 Nov 2012 20:11:31 +0000
Subject: (_apply_delta_rpm) split it out of _schedule_packages()

---
 urpm/install.pm | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'urpm')

diff --git a/urpm/install.pm b/urpm/install.pm
index 15f1127c..0a3ae22a 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -187,6 +187,23 @@ sub _schedule_packages_for_erasing {
     }
 }
 
+sub _apply_delta_rpm {
+    my ($urpm, $path, $mode, $pkg) = @_;
+    my $true_rpm = urpm::sys::apply_delta_rpm($path, "$urpm->{cachedir}/rpms", $pkg);
+    my $true_pkg;
+    if ($true_rpm) {
+	if (my ($id) = $urpm->parse_rpm($true_rpm)) {
+	    $true_pkg = defined $id && $urpm->{depslist}[$id];
+	    $mode->{$id} = $true_rpm;
+	} else {
+	    $urpm->{error}("Failed to parse $true_pkg");
+	}
+    } else {
+	$urpm->{error}(N("unable to extract rpm from delta-rpm package %s", $path));
+    }
+    $true_rpm, $true_pkg;
+}
+
 sub _schedule_packages {
     my ($urpm, $trans, $install, $upgrade, $update, %options) = @_;
     my (@trans_pkgs, @produced_deltas);
@@ -194,20 +211,10 @@ sub _schedule_packages {
 	foreach (keys %$mode) {
 	    my $pkg = $urpm->{depslist}[$_];
 	    $pkg->update_header($mode->{$_}, keep_all_tags => 1);
-	    my $true_pkg;
+	    my ($true_rpm, $true_pkg);
 	    if ($pkg->payload_format eq 'drpm') { #- handle deltarpms
-		my $true_rpm = urpm::sys::apply_delta_rpm($mode->{$_}, "$urpm->{cachedir}/rpms", $pkg);
-		if ($true_rpm) {
-		    push @produced_deltas, ($mode->{$_} = $true_rpm); #- fix path
-		    if (my ($id) = $urpm->parse_rpm($true_rpm)) {
-		        $true_pkg = defined $id && $urpm->{depslist}[$id];
-			$mode->{$id} = $true_rpm;
-		    } else {
-			$urpm->{error}("Failed to parse $true_pkg");
-		    }
-		} else {
-		    $urpm->{error}(N("unable to extract rpm from delta-rpm package %s", $mode->{$_}));
-		}
+		($true_rpm, $true_pkg) = _apply_delta_rpm($urpm, $_, $mode, $pkg);
+		push @produced_deltas, ($mode->{$_} = $true_rpm); #- fix path
 	    }
 	    if ($trans->add($true_pkg || $pkg, update => $update,
 		    $options{excludepath} ? (excludepath => [ split /,/, $options{excludepath} ]) : ())) {
-- 
cgit v1.2.1