From f273ccb172bd159522a4c1fbfde226b0c36b3f90 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 7 Dec 2001 18:27:45 +0000
Subject: --headers of urpmq with synthesis only.

---
 urpmi.spec |  6 +++++-
 urpmq      | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/urpmi.spec b/urpmi.spec
index 177b35c5..178a144d 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -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.
diff --git a/urpmq b/urpmq
index 74cb09e1..baf1408b 100755
--- a/urpmq
+++ b/urpmq
@@ -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";
-- 
cgit v1.2.1