From e8bd73f457e7ad957ce06ad6ceb7ecc1fd973aa8 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Sat, 6 Sep 2003 16:00:08 +0000
Subject: 4.4-33mdk

---
 urpm.pm    | 14 ++++++++++++++
 urpmi.spec |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/urpm.pm b/urpm.pm
index 040014a4..f4e96ef8 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -856,12 +856,14 @@ sub configure {
     unless ($options{noskipping}) {
 	$urpm->compute_flags($urpm->get_packages_list($urpm->{skiplist}, $options{skip}), skip => 1, callback => sub {
 				 my ($urpm, $pkg) = @_;
+				 $pkg->is_arch_compat or return;
 				 $urpm->{error}(N("skipping package %s", scalar($pkg->fullname)));
 			     });
     }
     unless ($options{noinstalling}) {
 	$urpm->compute_flags($urpm->get_packages_list($urpm->{instlist}, $options{inst}), disable_obsolete => 1, callback => sub {
 				 my ($urpm, $pkg) = @_;
+				 $pkg->is_arch_compat or return;
 				 $urpm->{log}(N("would install instead of upgrade package %s", scalar($pkg->fullname)));
 			     });
     }
@@ -1997,6 +1999,18 @@ this could happen if you mounted manually the directory when creating the medium
 	    }
 	}
 
+	foreach (@{$urpm->{media}}) {
+	    unlink "$urpm->{statedir}/names.$_->{name}";
+	    if (defined $_->{start} && defined $_->{end}) {
+		local *F;
+		open F, ">$urpm->{statedir}/names.$_->{name}";
+		foreach ($_->{start} .. $_->{end}) {
+		    print F $urpm->{depslist}[$_]->name."\n";
+		}
+		close F;
+	    }
+	}
+
 	#- this file is written in any cases.
 	$urpm->write_config();
     }
diff --git a/urpmi.spec b/urpmi.spec
index 935f920d..ab15c020 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 4.4
-Release: 32mdk
+Release: 33mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -202,6 +202,12 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 
 
 %changelog
+* Sat Sep  6 2003 François Pons <fpons@mandrakesoft.com> 4.4-33mdk
+- added automatic generation of /var/lib/urpmi/names.<medium>
+  for completion to be faster.
+- skipped or installed entries are first tested against
+  compatible arch.
+
 * Fri Sep  5 2003 François Pons <fpons@mandrakesoft.com> 4.4-32mdk
 - fixed symlink in current working directory.
 - added fixes from gc (signature checking improvement and
-- 
cgit v1.2.1