From e0d01eb2b127486889eb734b0e8286a73a6925d2 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Sat, 13 Aug 2011 11:13:24 +0000
Subject: [PATCH] show the default arch in simulate output if not specified in
 the file.

git-svn-id: http://emdebian.org/svn/current@8064 563faec7-e20c-0410-992a-a66f704d0ccd
---
 multistrap | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/multistrap b/multistrap
index 23b24a1..a6a6c92 100755
--- a/multistrap
+++ b/multistrap
@@ -97,7 +97,8 @@ $cfgdir=dirname($file);
 cascade($file);
 # Translators: fields are programname, version string, include file.
 printf (_g("%s %s using %s\n"), $progname, $ourversion, $file);
-
+$host = `dpkg --print-architecture`;
+chomp($host);
 foreach my $inc (@includes) {
 	cascade($inc);
 }
@@ -137,8 +138,6 @@ if (not defined $dir or not defined $arch) {
 
 # Translators: fields are: programname, versionstring, configfile.
 printf (_g("%s %s using %s\n"), $progname, $ourversion, $file);
-$host = `dpkg --print-architecture`;
-chomp ($host);
 if ((not defined $arch) or ($arch eq "")) {
 	$arch = $host;
 	printf (_g("Defaulting architecture to native: %s\n"),$arch);
@@ -1358,7 +1357,7 @@ sub dump_config {
 	if (defined $arch and $arch ne "") {
 		printf ("Architecture:\t\t"._g("Architecture to download: %s\n"), $arch);
 	} else {
-		$msg .= sprintf(_g("Cannot determine architecture from '%s'.\n"), $file);
+		$msg .= sprintf(_g("Cannot determine architecture from '%s'. Using $host.\n"), $file);
 	}
 	if ($olddpkg != 0) {
 		printf "MultiArch:\t\t%s\n",_g("Currently installed dpkg does not support MultiArch.");