From 1de484399a7c30a9bbf05d786b0f44ff6e4dce27 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 13 Nov 2002 16:05:50 +0000 Subject: 4.0-25mdk --- urpm.pm | 2 +- urpmi | 2 +- urpmi.spec | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/urpm.pm b/urpm.pm index 772ada62..a2f2d204 100644 --- a/urpm.pm +++ b/urpm.pm @@ -1054,7 +1054,7 @@ sub update_media { "../synthesis.hdlist$suffix.cz", !$suffix ? ("../synthesis.hdlist1.cz") : (), "../base/hdlist$suffix.cz", !$suffix ? ("../base/hdlist1.cz") : (), ) { - $basename = (/^.*\/([^\/]*)$/ && $1) || $_; + $basename = (/^.*\/([^\/]*)$/ && $1) || $_ or next; unlink "$urpm->{cachedir}/partial/$basename"; eval { diff --git a/urpmi b/urpmi index d67a4900..c8d44b7f 100755 --- a/urpmi +++ b/urpmi @@ -131,7 +131,7 @@ while (defined($_ = shift @ARGV)) { /^--fuzzy$/ and do { $fuzzy = 1; next }; /^--src$/ and do { $src = 1; next }; /^--clean$/ and do { $clean = 1; $noclean = 0; next }; - /^--noclean$/ and do { $clean = 0; $noclean = 1; next }; + /^--noclean$/ and do { $clean = $pre_clean_cache = $post_clean_cache = 0; $noclean = 1; next }; /^--(no-)?pre-clean$/ and do { $pre_clean_cache = !$1; next }; /^--(no-)?post-clean$/ and do { $post_clean_cache = !$1; next }; /^--force$/ and do { $force = 1; next }; diff --git a/urpmi.spec b/urpmi.spec index d0bb5b75..eb42fe00 100644 --- a/urpmi.spec +++ b/urpmi.spec @@ -2,7 +2,7 @@ Name: urpmi Version: 4.0 -Release: 24mdk +Release: 25mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -204,6 +204,11 @@ fi %changelog +* Wed Nov 13 2002 François Pons 4.0-25mdk +- fixed --noclean not really completely noclean. +- avoid possible lost of with_hdlist parameter on some case + when updating a medium. + * Thu Nov 7 2002 François Pons 4.0-24mdk - fixed still present debug output of urpmq -R. - fixed bad use of cached list file for file or nfs media. -- cgit v1.2.1