From 2714cdabc9f6e6adaad39d4e69fe6ac6518431e1 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Wed, 11 Dec 2002 15:57:32 +0000
Subject: 4.1-15mdk

---
 urpm.pm    | 4 ++--
 urpmf      | 8 ++++----
 urpmi.spec | 8 +++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/urpm.pm b/urpm.pm
index 1b709af9..9ae73d46 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -620,11 +620,11 @@ sub configure {
 	foreach (grep { !$_->{ignore} && (!$options{update} || $_->{update}) } @{$urpm->{media} || []}) {
 	    delete @{$_}{qw(start end)};
 	    if ($options{callback}) {
-		if (-s "$urpm->{statedir}/$_->{hdlist}" > 32) {
+		if ($options{hdlist} && -s "$urpm->{statedir}/$_->{hdlist}" > 32) {
 		    $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$_->{hdlist}"));
 		    eval { ($_->{start}, $_->{end}) = $urpm->parse_hdlist("$urpm->{statedir}/$_->{hdlist}",
 									  packing => 1, callback => $options{callback}) };
-		} elsif (-s "$urpm->{statedir}/synthesis.$_->{hdlist}" > 32) {
+		} else {
 		    $urpm->{log}(_("examining synthesis file [%s]", "$urpm->{statedir}/synthesis.$_->{hdlist}"));
 		    eval { ($_->{start}, $_->{end}) = $urpm->parse_synthesis("$urpm->{statedir}/synthesis.$_->{hdlist}",
 									     callback => $options{callback}) };
diff --git a/urpmf b/urpmf
index a36a8928..6adec839 100755
--- a/urpmf
+++ b/urpmf
@@ -48,7 +48,6 @@ usage:
 ") . _("  --files        - print tag files: all files (multiple lines).
 ") . _("  --conflicts    - print tag conflicts: all conflicts (multiple lines).
 ") . _("  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).
-") . _("  --prereqs      - print tag prereqs: all prereqs (multiple lines).
 ") . _("  -f             - print version, release and arch with name.
 ") . _("  -e             - include perl code directly as perl -e.
 ") . _("  -a             - binary AND operator, true if both expression are true.
@@ -82,8 +81,8 @@ while (defined($_ = shift @ARGV)) {
     /^--verbose$/ and do { $verbose = 1; next };
     /^--quiet$/ and do { $quiet = 1; next };
     /^--all$/ and do { $params{$_} = 1
-			 foreach qw(group size summary description provides requires files conflicts obsoletes prereqs); next };
-    /^--(group|size|epoch|summary|description|provides|requires|files|conflicts|obsoletes|prereqs)$/ and
+			 foreach qw(group size summary description provides requires files conflicts obsoletes); next };
+    /^--(group|size|epoch|summary|description|provides|requires|files|conflicts|obsoletes)$/ and
       do { $params{$1} = 1; next };
     /^-f$/ and do { $full = 'full'; next };
     /^-e$/ and do { $expr .= '('.$_.')'; next };
@@ -105,7 +104,7 @@ for (scalar(keys %params)) {
 
 #- build callback according expression.
 my $callback = 'sub { my ($urpm, $pkg) = @_; '; #- it is a good start for a sub, no ;-)
-foreach (qw(group size epoch summary description provides requires files conflicts obsoletes prereqs)) {
+foreach (qw(group size epoch summary description provides requires files conflicts obsoletes)) {
     $params{$_} and $callback .= 'foreach my $e ($pkg->'.$_.') { local $_ = $pkg->'.$full.'name."'.(!$quiet && ":$_").':$e"; '.$expr.' or next; print "$_\n" }';
 }
 $callback .= ' 1; }';
@@ -117,6 +116,7 @@ $urpm->configure(nocheck_access => 1,
 		 synthesis => $synthesis,
 		 update => $update,
 		 callback => $callback,
+		 hdlist => $params{description} || $params{files},
 		);
 
 #- that'all! all has been done by callback above.
diff --git a/urpmi.spec b/urpmi.spec
index 295b9fc5..29d70c31 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 4.1
-Release: 14mdk
+Release: 15mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -204,6 +204,12 @@ fi
 
 
 %changelog
+* Wed Dec 11 2002 François Pons <fpons@mandrakesoft.com> 4.1-15mdk
+- improve speed of urpmf dramatically if no --files (default if
+  no flags given) nor --description are given.
+- removed not coded --prereqs of urpmf (use --requires with [*]
+  instead).
+
 * Wed Dec 11 2002 François Pons <fpons@mandrakesoft.com> 4.1-14mdk
 - changed fuzzy search on provides to be deactived by default,
   use --fuzzy for that now (previous behaviour of --fuzzy is kept).
-- 
cgit v1.2.1