diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-03-26 14:19:43 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-03-26 14:19:43 +0000 |
| commit | 75cc208b75d3dc6852a956694646c189aa8b541d (patch) | |
| tree | f6bb500fa1b7132256b16eaa617c2ae2d1b6f314 | |
| parent | 8500b9980c2778fbce2fcb050d1049cee81809f8 (diff) | |
| download | urpmi-75cc208b75d3dc6852a956694646c189aa8b541d.tar urpmi-75cc208b75d3dc6852a956694646c189aa8b541d.tar.gz urpmi-75cc208b75d3dc6852a956694646c189aa8b541d.tar.bz2 urpmi-75cc208b75d3dc6852a956694646c189aa8b541d.tar.xz urpmi-75cc208b75d3dc6852a956694646c189aa8b541d.zip | |
*** empty log message ***
| -rw-r--r-- | urpm.pm | 12 | ||||
| -rw-r--r-- | urpmi.spec | 1 |
2 files changed, 13 insertions, 0 deletions
@@ -403,6 +403,11 @@ sub update_media { #- mount everything necessary. $urpm->try_mounting($dir, 'mount') or $urpm->{log}("unable to access medium \"$medium->{name}\""), next; + #- try to get the description if it has been found. + unlink "$urpm->{statedir}/descriptions.$medium->{name}"; + -e "$dir/../descriptions" and + system("cp", "-a", "$dir/../descriptions", "$urpm->{statedir}/descriptions.$medium->{name}"); + #- if the source hdlist is present and we are not forcing using rpms file if (!$options{force} && $medium->{with_hdlist} && -e "$dir/$medium->{with_hdlist}") { unlink "$urpm->{cachedir}/partial/$medium->{hdlist}"; @@ -445,6 +450,13 @@ sub update_media { } else { my $basename = $medium->{with_hdlist} =~ /^.*\/([^\/]*)$/ && $1; + #- try to get the description if it has been found. + unlink "$urpm->{cachedir}/partial/descriptions"; + rename "$urpm->{statedir}/descriptions.$medium->{name}", "$urpm->{cachedir}/partial/descriptions"; + system("wget", "-NP", "$urpm->{cachedir}/partial", "$medium->{url}/../descriptions"); + -e "$urpm->{cachedir}/partial/descriptions" and + rename "$urpm->{cachedir}/partial/descriptions", "$urpm->{statedir}/descriptions.$medium->{name}"; + #- try to sync (copy if needed) local copy after restored the previous one. unlink "$urpm->{cachedir}/partial/$basename"; $options{force} || ! -e "$urpm->{statedir}/$medium->{hdlist}" or @@ -117,6 +117,7 @@ autoirpm.uninstall * Mon Mar 26 2001 François Pons <fpons@mandrakesoft.com> 1.5-25mdk - sort list file so that rpm are sorted when installed. - increase speed for --auto-select: implies -M by default. +- added support for retrieving descriptions file. * Mon Mar 26 2001 François Pons <fpons@mandrakesoft.com> 1.5-24mdk - fixed annoying message when adding a medium (cp). |