diff options
| -rw-r--r-- | urpm.pm | 10 | ||||
| -rw-r--r-- | urpmi.spec | 6 | ||||
| -rwxr-xr-x | urpmq | 1 |
3 files changed, 12 insertions, 5 deletions
@@ -975,8 +975,9 @@ sub update_media { #- and check hdlist has not be named very strangely... if ($medium->{hdlist} ne 'list') { my $local_list = $medium->{with_hdlist} =~ /hd(list.*)\.cz$/ ? $1 : 'list'; + #- always delete a remaining list file in cache. + unlink "$urpm->{cachedir}/partial/list"; if (-s "$dir/$local_list") { - unlink "$urpm->{cachedir}/partial/list"; $urpm->{log}(_("copying source list of \"%s\"...", $medium->{name})); system("cp", "-pR", "$dir/$local_list", "$urpm->{cachedir}/partial/list") ? $urpm->{log}(_("...copying failed")) : $urpm->{log}(_("...copying done")); @@ -1238,8 +1239,11 @@ sub update_media { close LIST; #- check if at least something has been written into list file. - -s "$urpm->{cachedir}/partial/$medium->{list}" > 32 or - $error = 1, $urpm->{error}(_("nothing written in list file for \"%s\"", $medium->{name})); + if (-s "$urpm->{cachedir}/partial/$medium->{list}" > 32) { + $urpm->{log}(_("writing list file for medium \"%s\"", $medium->{name})); + } else { + $error = 1, $urpm->{error}(_("nothing written in list file for \"%s\"", $medium->{name})); + } } } @@ -2,7 +2,7 @@ Name: urpmi Version: 4.0 -Release: 23mdk +Release: 24mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -204,6 +204,10 @@ fi %changelog +* Thu Nov 7 2002 François Pons <fpons@mandrakesoft.com> 4.0-24mdk +- fixed still present debug output of urpmq -R. +- fixed bad use of cached list file for file or nfs media. + * Tue Oct 29 2002 François Pons <fpons@mandrakesoft.com> 4.0-23mdk - added MD5SUM file support for downloading hdlist/synthesis. - added -R option to urpmq to search what may provide packages. @@ -262,7 +262,6 @@ if ($query->{list_aliases}) { foreach (map { $urpm->{depslist}[$_] } grep { ! exists $state->{selected}{$_} && ! exists $properties{$_} } keys %{$requires{$n} || {}}) { - print "examining ".$_->fullname." from $n $s\n"; if (grep { URPM::ranges_overlap("$n $s", $_) } $_->requires) { push @properties, $_->id; $properties{$_->id} = undef; |