From 8c6ae7d6bd8c21fa09013fb31e9c4121a353556d Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Wed, 25 Aug 2010 19:53:33 +0000
Subject: [PATCH] revert r7373: does not actually do what it says on the tin -
 need to restructure the dump_config routine to enforce an explicit nested
 order.

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

diff --git a/multistrap b/multistrap
index 53801ff..afcce56 100755
--- a/multistrap
+++ b/multistrap
@@ -923,7 +923,7 @@ sub dump_config {
 		printf ("include:\t"._g("No included configuration files.\n"));
 	}
 	my @srcdump=();
-	foreach my $src (keys %sources) {
+	foreach my $src (sort keys %sources) {
 		next if ((!grep(/^$src$/i, @aptsources)) or (!grep(/^$src$/i, @debootstrap)));
 		push @srcdump, $sources{$src};
 	}
@@ -938,14 +938,14 @@ sub dump_config {
 		}
 	}
 	print "packages:\tPackages: ".join (", ", sort @long)."\n";
-	print "suites:  \tSuites: ".join (", ", values %suites)."\n";
-	print "components\tComponents: ".join (", ", values %components)."\n";
+	print "suites:  \tSuites: ".join (", ", sort values %suites)."\n";
+	print "components\tComponents: ".join (", ", sort values %components)."\n";
 	my $msg="omitdebsrc\t"._g("Omit deb-src from sources.list for sections:");
 	foreach my $omit (sort keys %omitdebsrc) {
 		$msg .= $omitdebsrc{$omit} if (defined $omitdebsrc{$omit});
 	}
 	print "$msg\n";
-        $msg="";
+	$msg="";
 	if (defined $explicit_suite) {
 		printf("explicitsuite:\t"._g("Explicit suite selection: Yes\n"));
 	} else {