From c3a8748e270ac518b61a4d6aafba5d65559d5141 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 22 Nov 2006 12:23:32 +0000
Subject: remove md5sum from @PER_MEDIA_OPT (which only list per-medium options
 in urpmi.cfg), so that urpmi.cfg do not contain the md5sum (and so urpmi.cfg
 doesn't need to be modified on urpmi.update, only /var/lib/urpmi/MD5SUM is
 modified)

(bug introduced when creating @PER_MEDIA_OPT in r35745, fixed in r35832, but
broken again in r35953)
---
 urpm/ldap.pm  | 2 +-
 urpm/media.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'urpm')

diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index df72c466..66fcc8db 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -12,7 +12,7 @@ use Net::LDAP;
 (our $VERSION) = q($Revision$) =~ /(\d+)/;
 
 our $LDAP_CONFIG_FILE = '/etc/ldap.conf';
-my @per_media_opt = (@urpm::media::PER_MEDIA_OPT, qw(ftp-proxy http-proxy));
+my @per_media_opt = (@urpm::media::PER_MEDIA_OPT, qw(md5sum ftp-proxy http-proxy));
 
 # TODO
 # use srv dns record ?
diff --git a/urpm/media.pm b/urpm/media.pm
index c823a8d5..68665f1a 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -14,7 +14,6 @@ our @PER_MEDIA_OPT = qw(
     ignore
     key-ids
     list
-    md5sum
     noreconfigure
     priority
     priority-upgrade
@@ -152,7 +151,7 @@ sub read_config {
 
     $urpm->{media} = [ sort { $a->{priority} <=> $b->{priority} } @{$urpm->{media}} ];
 
-    #- read MD5 sums (usually not in urpmi.cfg but in a separate file)
+    #- read MD5 sums (not in urpmi.cfg but in a separate file)
     foreach (@{$urpm->{media}}) {
 	if (my $md5sum = urpm::md5sum::from_MD5SUM("$urpm->{statedir}/MD5SUM", statedir_hdlist_or_synthesis($urpm, $_))) {
 	    $_->{md5sum} = $md5sum;
@@ -1582,6 +1581,7 @@ sub _update_medium_first_pass {
 		}
 		return;
 	    }
+	    unlink statedir_list($urpm, $medium);
 	    delete $medium->{list};
 
 	    {
-- 
cgit v1.2.1