josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clarify error reporting in the --simulate option, warn if sections are not defined. (Closes: #579627)

Browse source 
git-svn-id: http://emdebian.org/svn/current@7183 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-05-05 19:10:43 +00:00
parent 227736b1c1
commit d5c6e6b8e5
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cross/armel.conf
View file

@ -4,7 +4,7 @@ omitrequired=false
configscript= configscript=
setupscript=/usr/share/multistrap/setcrossarch.sh setupscript=/usr/share/multistrap/setcrossarch.sh
debootstrap=Debian Base Toolchains debootstrap=Debian Base Toolchains
aptsources=Debian Toolchains aptsources=Debian Toolchains Foo
tarballname=pdebuild-cross.tgz tarballname=pdebuild-cross.tgz
[Toolchains] [Toolchains]

4
debian/changelog vendored
View file

@ -4,8 +4,10 @@ multistrap (2.1.4) unstable; urgency=low
the chroot - using the dpkg-cross default_arch, if any. the chroot - using the dpkg-cross default_arch, if any.
* Clarify documentation of bootstrap and aptsources sections * Clarify documentation of bootstrap and aptsources sections
(Closes: #579626) (Closes: #579626)
* Clarify error reporting in the --simulate option, warn if
sections are not defined. (Closes: #579627)
-- Neil Williams <codehelp@debian.org> Wed, 05 May 2010 19:49:22 +0100 -- Neil Williams <codehelp@debian.org> Wed, 05 May 2010 20:08:44 +0100
multistrap (2.1.3) experimental; urgency=low multistrap (2.1.3) experimental; urgency=low

17
multistrap
View file

@ -31,7 +31,7 @@ use vars qw/ $progname $ourversion $dstrap $extra @aptsources $mirror
$component $repo @dirs @touch %sources $section %keys $host $key $value $component $repo @dirs @touch %sources $section %keys $host $key $value
$type $file $config $tidy $noauth $keyring %keyrings $deflist $cfgdir $type $file $config $tidy $noauth $keyring %keyrings $deflist $cfgdir
@extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun @extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun
$omitpreinst @reinstall $tgzname %uniq %required /; $omitpreinst @reinstall $tgzname %uniq %required $check @check %uniq /;
setlocale(LC_MESSAGES, ""); setlocale(LC_MESSAGES, "");
textdomain("multistrap"); textdomain("multistrap");
@ -940,6 +940,17 @@ sub _g {
sub dump_config { sub dump_config {
print "Bootstrap: ".join (", ", sort @debootstrap)."\n"; print "Bootstrap: ".join (", ", sort @debootstrap)."\n";
print "Apt sources: ".join (", ", sort @aptsources)."\n"; print "Apt sources: ".join (", ", sort @aptsources)."\n";
@check=();
%uniq=();
push @check, @debootstrap;
push @check, @aptsources;
foreach my $sect (@check) { $uniq{$sect}++; }
foreach my $sect (sort keys %uniq)
{
if (not exists $keys{$sect}) {
$msg = sprintf (_g("ERROR: The '%s' section is not defined.\n"), $sect);
}
}
print "Includes: ".join (", ", sort @includes)."\n"; print "Includes: ".join (", ", sort @includes)."\n";
print "Sources: ".join (", ", sort values %sources)."\n"; print "Sources: ".join (", ", sort values %sources)."\n";
print "Packages: ".join (", ", sort values %packages)."\n"; print "Packages: ".join (", ", sort values %packages)."\n";
@ -958,5 +969,9 @@ sub dump_config {
print "tidy_apt: $tidy\n" if (defined $tidy); print "tidy_apt: $tidy\n" if (defined $tidy);
print "no_authentication: $noauth\n" if (defined $noauth); print "no_authentication: $noauth\n" if (defined $noauth);
print "source_dir: $sourcedir\n" if (defined $sourcedir); print "source_dir: $sourcedir\n" if (defined $sourcedir);
if (defined $msg) {
warn ("\n$msg");
exit 1;
}
exit 0; exit 0;
} }