diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-11-27 13:37:53 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-11-27 13:37:53 +0000 |
| commit | 5f7fe924ae8e5acd605d4eef443362cec521f457 (patch) | |
| tree | d4539156dc96fe81eac812bef7579f1aa067065a | |
| parent | 948c59848688dff57de58dec0dd75d6ec32ed4a4 (diff) | |
| download | urpmi-5f7fe924ae8e5acd605d4eef443362cec521f457.tar urpmi-5f7fe924ae8e5acd605d4eef443362cec521f457.tar.gz urpmi-5f7fe924ae8e5acd605d4eef443362cec521f457.tar.bz2 urpmi-5f7fe924ae8e5acd605d4eef443362cec521f457.tar.xz urpmi-5f7fe924ae8e5acd605d4eef443362cec521f457.zip | |
fix optimization on getting depslist.ordered.
| -rw-r--r-- | urpm.pm | 26 | ||||
| -rw-r--r-- | urpmi.spec | 6 |
2 files changed, 5 insertions, 27 deletions
@@ -643,32 +643,6 @@ sub update_media { $urpm->{modified} = 0; } - if ($options{force} < 1 && @{$urpm->{media}} == 1 && $urpm->{media}[0]{with_hdlist}) { - #- this is a special mode where is only one hdlist using a source hdlist, in such - #- case we are searching for source depslist, provides and compss files. - #- if they are not found or if force is used, an error message is printed and - #- we continue using computed results. - my $medium = $urpm->{media}[0]; - my $basedir = $medium->{with_hdlist} =~ /^(.*)\/[^\/]*$/ && $1; - - foreach my $target ($urpm->{depslist}, $urpm->{provides}, $urpm->{compss}, 'END') { - $target eq 'END' and $urpm->{modified} = 0, last; #- assume everything is ok. - my $basename = $target =~ /^.*\/([^\/]*)$/ && $1; - - if (my ($prefix, $dir) = $medium->{url} =~ /^(removable_?[^_:]*|file):\/(.*)/) { - #- the directory should be existing in any cases or this is an error - #- so there is no need of trying to mount it. - -e "$dir/$basedir/$basename" or last; - system("cp", "-f", "$dir/$basedir/$basename", $target); - $? == 0 or last; - } else { - #- we have to use wget here instead, no error printed. - system("wget", "-O", $target, "$medium->{url}/$basedir/$basename"); - $? == 0 or last; - } - } - } - if ($urpm->{modified}) { #- cleaning. $urpm->{params}->clean(); @@ -2,7 +2,7 @@ Name: urpmi Version: 2.1 -Release: 1mdk +Release: 2mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -126,6 +126,10 @@ rm -f /var/lib/urpmi/depslist %changelog +* Tue Nov 27 2001 François Pons <fpons@mandrakesoft.com> 2.1-2mdk +- removed old optimization to get existing depslist instead + of rebuilding it. + * Mon Nov 26 2001 François Pons <fpons@mandrakesoft.com> 2.1-1mdk - removed obsoleted code in urpm module. - ignore -m, -M and -c flag of urpmi/urpmq. |