create urpm::md5sum, move md5sum functions into it:

- urpm::util::md5sum() -> urpm::md5sum::compute()
- urpm::local_md5sum() -> urpm::md5sum::on_local_medium()

3 files changed, 73 insertions, 63 deletions

diff --git a/urpm.pm b/urpm.pm
index 985af75a..d708b755 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -10,6 +10,7 @@ use urpm::download;
 use urpm::util;
 use urpm::sys;
 use urpm::cfg;
+use urpm::md5sum;
 use MDV::Distribconf;
 
 our $VERSION = '4.8.29';
@@ -199,7 +200,7 @@ sub read_config {
 
     #- read MD5 sums (usually not in urpmi.cfg but in a separate file)
     foreach (@{$urpm->{media}}) {
-	if (my $md5sum = from_MD5SUM("$urpm->{statedir}/MD5SUM", statedir_hdlist_or_synthesis($urpm, $_))) {
+	if (my $md5sum = urpm::md5sum::from_MD5SUM("$urpm->{statedir}/MD5SUM", statedir_hdlist_or_synthesis($urpm, $_))) {
 	    $_->{md5sum} = $md5sum;
 	}
     }
@@ -1277,7 +1278,7 @@ sub get_hdlist_or_synthesis_and_check_md5sum__local {
     #- keep checking md5sum of file just copied ! (especially on nfs or removable device).
     if ($retrieved_md5sum) {
 	$urpm->{log}(N("computing md5sum of copied source hdlist (or synthesis)"));
-	md5sum(cachedir_hdlist($urpm, $medium)) eq $retrieved_md5sum or
+	urpm::md5sum::compute(cachedir_hdlist($urpm, $medium)) eq $retrieved_md5sum or
 	  $urpm->{error}(N("copy of [%s] failed (md5sum mismatch)", _url_with_hdlist($medium))), return;
     }
 
@@ -1392,8 +1393,8 @@ this could happen if you mounted manually the directory when creating the medium
 	    my ($retrieved_md5sum);
 
 	    if (!$options->{nomd5sum} && file_size(_hdlist_dir($medium) . '/MD5SUM') > 32) {
-		$retrieved_md5sum = from_MD5SUM__or_warn($urpm, _hdlist_dir($medium) . '/MD5SUM', basename($medium->{with_hdlist}));
-		if (local_md5sum($urpm, $medium, $options->{force})) {
+		$retrieved_md5sum = urpm::md5sum::from_MD5SUM__or_warn($urpm, _hdlist_dir($medium) . '/MD5SUM', basename($medium->{with_hdlist}));
+		if (urpm::md5sum::on_local_medium($urpm, $medium, $options->{force})) {
 		    _read_existing_synthesis_and_hdlist_if_same_md5sum($urpm, $medium, $retrieved_md5sum)
 		      and return 'unmodified';
 		}
@@ -1454,8 +1455,8 @@ sub _update_medium__parse_if_unmodified__remote {
 	      urpm::download::sync($urpm, $medium, 
 				   [ reduce_pathname(_hdlist_dir($medium) . '/MD5SUM') ],
 				   quiet => 1) && file_size("$urpm->{cachedir}/partial/MD5SUM") > 32) {
-	    if (local_md5sum($urpm, $medium, $options->{force} >= 2)) {
-		$retrieved_md5sum = from_MD5SUM__or_warn($urpm, "$urpm->{cachedir}/partial/MD5SUM", $basename);
+	    if (urpm::md5sum::on_local_medium($urpm, $medium, $options->{force} >= 2)) {
+		$retrieved_md5sum = urpm::md5sum::from_MD5SUM__or_warn($urpm, "$urpm->{cachedir}/partial/MD5SUM", $basename);
 		_read_existing_synthesis_and_hdlist_if_same_md5sum($urpm, $medium, $retrieved_md5sum)
 		  and return 'unmodified';
 	    }
@@ -1508,7 +1509,7 @@ sub _update_medium__parse_if_unmodified__remote {
     #- check downloaded file has right signature.
     if (file_size("$urpm->{cachedir}/partial/$basename") >= 20 && $retrieved_md5sum) {
 	$urpm->{log}(N("computing md5sum of retrieved source hdlist (or synthesis)"));
-	unless (md5sum("$urpm->{cachedir}/partial/$basename") eq $retrieved_md5sum) {
+	unless (urpm::md5sum::compute("$urpm->{cachedir}/partial/$basename") eq $retrieved_md5sum) {
 	    $urpm->{error}(N("...retrieving failed: md5sum mismatch"));
 	    unlink "$urpm->{cachedir}/partial/$basename";
 	}
@@ -3101,46 +3102,6 @@ sub get_updates_description {
     \%update_descr;
 }
 
-#- parse an MD5SUM file from a mirror
-sub from_MD5SUM {
-    my ($md5sum_file, $f) = @_;  
-    my $basename = basename($f);
-
-    my ($retrieved_md5sum) = map {
-	my ($md5sum, $file) = m|(\S+)\s+(?:\./)?(\S+)|;
-	$file && $file eq $basename ? $md5sum : @{[]};
-    } cat_($md5sum_file);
-
-    $retrieved_md5sum;
-}
-
-sub from_MD5SUM__or_warn {
-    my ($urpm, $md5sum_file, $basename) = @_;
-    $urpm->{log}(N("examining %s file", $md5sum_file));
-    my $retrieved_md5sum = from_MD5SUM($md5sum_file, $basename) 
-      or $urpm->{log}(N("warning: md5sum for %s unavailable in MD5SUM file", $basename));
-    return $retrieved_md5sum;
-}
-
-sub local_md5sum {
-    my ($urpm, $medium, $force) = @_;
-    if ($force) {
-	#- force downloading the file again, else why a force option has been defined ?
-	delete $medium->{md5sum};
-    } else {
-	$medium->{md5sum} ||= compute_local_md5sum($urpm, $medium);
-    }
-    $medium->{md5sum};
-}
-
-sub compute_local_md5sum {
-    my ($urpm, $medium) = @_;
-
-    my $f = statedir_hdlist_or_synthesis($urpm, $medium);
-    $urpm->{log}(N("computing md5sum of existing source hdlist (or synthesis) [%s]", $f));
-    -e $f && md5sum($f);
-}
-
 sub error_restricted ($) {
     my ($urpm) = @_;
     $urpm->{fatal}(2, N("This operation is forbidden while running in restricted mode"));
diff --git a/urpm/md5sum.pm b/urpm/md5sum.pm
new file mode 100644
index 00000000..c94fb96e
--- /dev/null
+++ b/urpm/md5sum.pm
@@ -0,0 +1,64 @@
+package urpm::md5sum;
+
+use urpm;
+use urpm::util;
+use urpm::msg;
+
+
+#- parse an MD5SUM file from a mirror
+sub from_MD5SUM {
+    my ($md5sum_file, $f) = @_;  
+    my $basename = basename($f);
+
+    my ($retrieved_md5sum) = map {
+	my ($md5sum, $file) = m|(\S+)\s+(?:\./)?(\S+)|;
+	$file && $file eq $basename ? $md5sum : @{[]};
+    } cat_($md5sum_file);
+
+    $retrieved_md5sum;
+}
+
+sub from_MD5SUM__or_warn {
+    my ($urpm, $md5sum_file, $basename) = @_;
+    $urpm->{log}(N("examining %s file", $md5sum_file));
+    my $retrieved_md5sum = from_MD5SUM($md5sum_file, $basename) 
+      or $urpm->{log}(N("warning: md5sum for %s unavailable in MD5SUM file", $basename));
+    return $retrieved_md5sum;
+}
+
+sub on_local_medium {
+    my ($urpm, $medium, $force) = @_;
+    if ($force) {
+	#- force downloading the file again, else why a force option has been defined ?
+	delete $medium->{md5sum};
+    } else {
+	$medium->{md5sum} ||= compute_on_local_medium($urpm, $medium);
+    }
+    $medium->{md5sum};
+}
+
+sub compute_on_local_medium {
+    my ($urpm, $medium) = @_;
+
+    require urpm; #- help perl_checker
+    my $f = urpm::statedir_hdlist_or_synthesis($urpm, $medium);
+    $urpm->{log}(N("computing md5sum of existing source hdlist (or synthesis) [%s]", $f));
+    -e $f && compute($f);
+}
+
+sub compute {
+    my ($file) = @_;
+    eval { require Digest::MD5 };
+    if ($@) {
+	#- Use an external command to avoid depending on perl
+	return (split ' ', `/usr/bin/md5sum '$file'`)[0];
+    } else {
+	my $ctx = Digest::MD5->new;
+	open my $fh, $file or return '';
+	$ctx->addfile($fh);
+	close $fh;
+	return $ctx->hexdigest;
+    }
+}
+
+1;
diff --git a/urpm/util.pm b/urpm/util.pm
index b12c49a0..58922349 100644
--- a/urpm/util.pm
+++ b/urpm/util.pm
@@ -8,7 +8,7 @@ our @ISA = 'Exporter';
 our @EXPORT = qw(quotespace unquotespace
     remove_internal_name
     reduce_pathname offset_pathname
-    md5sum untaint
+    untaint
     copy_and_own
     same_size_and_mtime
     difference2 member file_size cat_ dirname basename
@@ -87,21 +87,6 @@ sub untaint {
     @r == 1 ? $r[0] : @r;
 }
 
-sub md5sum {
-    my ($file) = @_;
-    eval { require Digest::MD5 };
-    if ($@) {
-	#- Use an external command to avoid depending on perl
-	return (split ' ', `/usr/bin/md5sum '$file'`)[0];
-    } else {
-	my $ctx = Digest::MD5->new;
-	open my $fh, $file or return '';
-	$ctx->addfile($fh);
-	close $fh;
-	return $ctx->hexdigest;
-    }
-}
-
 sub copy {
     my ($file, $dest) = @_;
     !system("/bin/cp", "-p", "-L", "-R", $file, $dest);