4.4-33mdk

1 files changed, 14 insertions, 0 deletions

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();
     }