From 6ab6e4c33dbe826782ae71640af778f32793f610 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 3 Mar 2008 17:22:05 +0000
Subject: - urpmq:   o --list: speed it up (2.5x faster, and 6x faster with
 names.<medium>) - all tools:   o restore generation of
 /var/lib/urpmi/names.<medium>, but it is now done in     urpmq/urpmi/urpmf
 (and so only if used as root)

---
 urpmq | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'urpmq')

diff --git a/urpmq b/urpmq
index 0656fcba..d4998bd6 100755
--- a/urpmq
+++ b/urpmq
@@ -126,11 +126,14 @@ my $urpm = urpm->new_parse_cmdline or exit(1);
 $urpm->{info} = sub { print STDERR "$_[0]\n" };
 $urpm->{log} = sub { print STDERR "$_[0]\n" } if $options{verbose} > 0;
 
+my $only_list_name = $options{list} && !($options{version} && $options{release} && $options{arch});
+
 #- improve speed if using any list_... options.
 $options{nodepslist} = $options{list_aliases}
 				|| $options{list_nodes}
 				|| $options{list_media}
 				|| $options{dump_config}
+				|| $only_list_name # urpmq will parse synthesis only if names.* are not already there
 				|| $options{list_url};
 $options{nolock} = 1 if $options{nodepslist};
 
@@ -204,8 +207,24 @@ if ($options{list_aliases}) {
     exit 0;
 } elsif ($options{list}) {
     !@names && !@src_names or $urpm->{fatal}(1, N("use -l to list files"));
-    # --list lists all available packages: select them all
-    @{$state->{selected}}{0 .. $#{$urpm->{depslist}}} = ();
+
+    if ($only_list_name) {
+	# special code, much faster
+	my @media = urpm::media::non_ignored_media($urpm, $options{update});
+	my @names_files = grep { -e $_ } map { urpm::media::statedir_names($urpm, $_) } @media;
+
+	if (@media == @names_files) {
+	    $urpm->{log}("using " . join(' ', @names_files));
+	    print sort map { cat_($_) } @names_files;
+	} else {
+	    urpm::media::parse_media($urpm, \%options);
+	    print sort map { $_->name . "\n" } @{$urpm->{depslist}};
+	}
+	# we're done now, but we don't exit here so locks are correctly released if needed
+    } else {
+	# use the generic code
+	@{$state->{selected}}{0 .. $#{$urpm->{depslist}}} = ();
+    }
 } else {
     %requested = $urpm->register_rpms(@files);
 
-- 
cgit v1.2.1