From b96eaa5d631d9a95c604ea0f524ad5e48d282320 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Sat, 27 Feb 2010 20:05:07 +0000
Subject: [PATCH] Add component support to multistrap.

git-svn-id: http://emdebian.org/svn/current@6769 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog |  3 ++-
 debian/control   |  2 +-
 em_multistrap    | 13 ++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80d985e..2f6a9b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ emdebian-rootfs (2.0.5) unstable; urgency=low
 
   * [INTL:fr] French program output translation (Closes: #558834)
   * Add shortcut conf files
+  * Add component support to multistrap.
 
- -- Neil Williams <codehelp@debian.org>  Sat, 27 Feb 2010 19:59:04 +0000
+ -- Neil Williams <codehelp@debian.org>  Sat, 27 Feb 2010 19:59:54 +0000
 
 emdebian-rootfs (2.0.4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 513da81..f8df554 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Wookey <wookey@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), po4a (>= 0.37.1), po-debconf
 Build-Depends-Indep: devscripts, docbook-xml, docbook-xsl,
  gnupg, libxml2-utils, xml-core, xsltproc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.emdebian.org/
 Vcs-Browser: http://buildd.emdebian.org/svn/browser/current/
 Vcs-Svn: http://buildd.emdebian.org/repos/current/
diff --git a/em_multistrap b/em_multistrap
index 2e0c587..312628d 100755
--- a/em_multistrap
+++ b/em_multistrap
@@ -27,7 +27,7 @@ use Locale::gettext;
 use vars qw/ $progname $ourversion $dstrap $extra @aptsources
  @archives $deb $cachedir $config_str %packages $retval $str $retries
  $dir $include $arch $foreign $suite $url $unpack $sourcedir $msg
- @e $sourcesname $libdir $dpkgdir @debootstrap %suites $mirror $etcdir
+ @e $sourcesname $libdir $dpkgdir @debootstrap %suites %components $component $mirror $etcdir
  $repo @dirs @touch %sources $section %keys $host $key $value $type
  $file $config $tidy $noauth $keyring %keyrings $deflist @extrapkgs /;
 
@@ -87,6 +87,7 @@ foreach $key (%$config)
 %sources=();
 %packages=();
 %suites=();
+%components=();
 %keyrings=();
 @aptsources=();
 foreach $section (sort keys %keys)
@@ -115,6 +116,11 @@ foreach $section (sort keys %keys)
 		$sources{$section}=$keys{$section}{'source'};
 		$packages{$section}=$keys{$section}{'packages'};
 		$suites{$section}=$keys{$section}{'suite'};
+		$components{$section}=$keys{$section}{'components'};
+		if (not exists $components{$section})
+		{
+			$components{$section}='main';
+		}
 		$keyrings{$section}=$keys{$section}{'keyring'};
 		push @extrapkgs, split (' ', lc($keys{$section}{'additional'}));
 	}
@@ -247,9 +253,10 @@ foreach my $aptsrc (@aptsources)
 			or die _g("Cannot open sources list"). $!;
 		$mirror = $sources{$aptsrc};
 		$suite = $suites{$aptsrc};
+		$component = $components{$aptsrc};
 		print SOURCES<<END;
-deb $mirror $suite main
-deb-src $mirror $suite main
+deb $mirror $suite $component
+deb-src $mirror $suite $component
 END
 		close SOURCES;
 	}