From 1890e22b14642947dfae7de98dbc2cb1e2f0dcbd Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <josch@mister-muffin.de>
Date: Sun, 4 Nov 2018 20:38:55 +0100
Subject: [PATCH] do not make the default mirror for the native arch only. The
 sane expectation is, that the default mirror is for any architecture.

---
 mmdebstrap | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/mmdebstrap b/mmdebstrap
index 134713c..727c531 100755
--- a/mmdebstrap
+++ b/mmdebstrap
@@ -1531,10 +1531,6 @@ sub main() {
 	    # come from standard input
 	    $sourceslist .= $stdindata;
 	} else {
-	    my $archopt = '';
-	    if (scalar @{$options->{foreignarchs}} > 0) {
-		$archopt = " [arch=$options->{nativearch}]";
-	    }
 	    if (scalar @ARGV > 0) {
 		for my $arg (@ARGV) {
 		    if ($arg eq '-') {
@@ -1542,7 +1538,7 @@ sub main() {
 		    } elsif ($arg =~ /^deb(-src)? /) {
 			$sourceslist .= "$arg\n";
 		    } elsif ($arg =~ /:\/\//) {
-			$sourceslist .= "deb$archopt $arg $suite $options->{components}\n";
+			$sourceslist .= "deb $arg $suite $options->{components}\n";
 		    } elsif (-f $arg) {
 			open my $fh, '<', $arg or die "cannot open $arg: $!";
 			while (my $line = <$fh>) {
@@ -1563,10 +1559,10 @@ sub main() {
 	    } elsif ($stdindata ne '') {
 		$sourceslist .= $stdindata;
 	    } else {
-		$sourceslist .= "deb$archopt http://deb.debian.org/debian $suite $options->{components}\n";
+		$sourceslist .= "deb http://deb.debian.org/debian $suite $options->{components}\n";
 		if (any { $_ eq $suite } ('stable', 'oldstable', 'stretch') ) {
-		    $sourceslist .= "deb$archopt http://deb.debian.org/debian $suite-updates $options->{components}\n";
-		    $sourceslist .= "deb$archopt http://security.debian.org/debian-security $suite/updates $options->{components}\n";
+		    $sourceslist .= "deb http://deb.debian.org/debian $suite-updates $options->{components}\n";
+		    $sourceslist .= "deb http://security.debian.org/debian-security $suite/updates $options->{components}\n";
 		}
 	    }
 	}