From 79d2a8c9072af13ee2bc7e92d159aa49ef2f5d73 Mon Sep 17 00:00:00 2001 From: codehelp Date: Fri, 29 Oct 2010 14:32:06 +0000 Subject: [PATCH] Allow missing packages lines and add note about using omitdebsrc with debian-ports. git-svn-id: http://emdebian.org/svn/current@7587 563faec7-e20c-0410-992a-a66f704d0ccd --- debian/changelog | 7 +++++++ multistrap | 3 ++- pod/multistrap | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e48d9ce..4766bd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +multistrap (2.1.9) experimental; urgency=low + + * Allow missing packages lines and add note about using omitdebsrc + with debian-ports. + + -- Neil Williams Fri, 29 Oct 2010 15:27:21 +0100 + multistrap (2.1.8) experimental; urgency=low [ Wookey ] diff --git a/multistrap b/multistrap index 45e932e..c4f9334 100755 --- a/multistrap +++ b/multistrap @@ -972,6 +972,7 @@ sub dump_config { # explain the bootstrap section details explicitly and just refer to # those for the apt sources. foreach my $sect_name (@check) { + next unless (defined $packages{$sect_name}); printf ("Section name:\t$sect_name\n"); print "\tsource:\t\t$sources{$sect_name}\n"; my @sorted = split(/ /, $packages{$sect_name}); @@ -1006,7 +1007,7 @@ sub dump_config { $srcmsg .= sprintf(" %s",_g("None.")); } else { foreach my $omit (sort keys %omitdebsrc) { - $srcmsg .= $omitdebsrc{$omit} if (defined $omitdebsrc{$omit}); + $srcmsg .= " " . $omitdebsrc{$omit} if (defined $omitdebsrc{$omit}); } } print "$srcmsg\n"; diff --git a/pod/multistrap b/pod/multistrap index 995f7ab..b5bf298 100644 --- a/pod/multistrap +++ b/pod/multistrap @@ -462,6 +462,9 @@ apt-cache size), use the omitdebsrc field in each Section. suite=testing omitdebsrc=true +omitdebsrc is necessary when using packages from debian-ports where +packages do not have sources, except "unreleased". + =cut =head1 fakeroot