diff options
| -rw-r--r-- | urpmi.spec | 6 | ||||
| -rwxr-xr-x | urpmq | 12 |
2 files changed, 14 insertions, 4 deletions
@@ -2,7 +2,7 @@ Name: urpmi Version: 3.0 -Release: 3mdk +Release: 4mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -139,6 +139,10 @@ fi %changelog +* Fri Dec 7 2001 François Pons <fpons@mandrakesoft.com> 3.0-4mdk +- fixed in urpmq to handle --headers (needed by rpminst) when + no hdlist are present. + * Fri Dec 7 2001 François Pons <fpons@mandrakesoft.com> 3.0-3mdk - fixed back /etc/urpmi/urpmi.cfg update. - fixed back synthesis source management. @@ -144,9 +144,15 @@ if ($query->{headers} || $query->{sources}) { map { /(.*)\/([^\/]*)-([^-]*)-([^-]*)\.([^\.]*)\.rpm/ and "$2-$3-$4.$5" } values %{$list->[$_]}); @headers > 0 or next; - require packdrake; - my $packer = new packdrake("$urpm->{statedir}/$urpm->{media}[$_]{hdlist}"); - $packer->extract_archive(undef, @headers); + if (-s "$urpm->{statedir}/$urpm->{media}[$_]{hdlist}") { + require packdrake; + my $packer = new packdrake("$urpm->{statedir}/$urpm->{media}[$_]{hdlist}"); + $packer->extract_archive(undef, @headers); + } else { + #- fallback to retrieve rpm package before, so that --headers will be ok. + my %uploads = $urpm->upload_source_packages({}, $list, '', undef); + system "rpm2header", values %uploads; + } } } else { print join "\n", values %$local_sources; values %$local_sources and print "\n"; |