josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

improve debug and error message wording

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2023-03-16 22:18:49 +01:00
parent a719ffd20a
commit ff9b76ed19
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mmdebstrap
View file

@ -4800,7 +4800,8 @@ sub main() {
} }
exec 'fakechroot', 'fakeroot', @prefix, $PROGRAM_NAME, @ARGVORIG; exec 'fakechroot', 'fakeroot', @prefix, $PROGRAM_NAME, @ARGVORIG;
} else { } else {
error "unable to pick chroot mode automatically"; error( "unable to pick chroot mode automatically (use --mode for "
. "manual selection)");
} }
info "automatically chosen mode: $options->{mode}"; info "automatically chosen mode: $options->{mode}";
} elsif ($options->{mode} eq 'root') { } elsif ($options->{mode} eq 'root') {
@ -5172,12 +5173,14 @@ sub main() {
my $keyring my $keyring
= get_keyring_by_suite($options->{suite}, \%suite_by_vendor); = get_keyring_by_suite($options->{suite}, \%suite_by_vendor);
if (!defined $keyring) { if (!defined $keyring) {
debug "get_keyring_by_suite() cannot find keyring";
return ''; return '';
} }
# we can only check if we need the signed-by entry if we u # we can only check if we need the signed-by entry if we u
# automatically chosen keyring exists # automatically chosen keyring exists
if (!defined $keyring || !-e $keyring) { if (!defined $keyring || !-e $keyring) {
debug "found keyring does not exist";
return ''; return '';
} }
@ -5222,7 +5225,7 @@ sub main() {
# find all the fingerprints of the keys apt currently # find all the fingerprints of the keys apt currently
# knows about # knows about
my @keyrings = (); my @keyrings = ();
opendir my $dh, "$options->{apttrustedparts}" opendir my $dh, $options->{apttrustedparts}
or error "cannot read $options->{apttrustedparts}"; or error "cannot read $options->{apttrustedparts}";
while (my $filename = readdir $dh) { while (my $filename = readdir $dh) {
if ($filename !~ /\.(asc|gpg)$/) { if ($filename !~ /\.(asc|gpg)$/) {
@ -5231,7 +5234,7 @@ sub main() {
$filename = "$options->{apttrustedparts}/$filename"; $filename = "$options->{apttrustedparts}/$filename";
# skip empty keyrings # skip empty keyrings
-s "$filename" || next; -s "$filename" || next;
push @keyrings, "$filename"; push @keyrings, $filename;
} }
closedir $dh; closedir $dh;
if (-s $options->{apttrusted}) { if (-s $options->{apttrusted}) {
@ -5239,6 +5242,7 @@ sub main() {
} }
my @aptfingerprints = (); my @aptfingerprints = ();
if (scalar @keyrings == 0) { if (scalar @keyrings == 0) {
debug "no keyring is trusted by apt";
return " [signed-by=\"$keyring\"]"; return " [signed-by=\"$keyring\"]";
} }
info "finding correct signed-by value..."; info "finding correct signed-by value...";
@ -5262,6 +5266,7 @@ sub main() {
} }
print_progress("done"); print_progress("done");
if (scalar @aptfingerprints == 0) { if (scalar @aptfingerprints == 0) {
debug "no fingerprints found";
return " [signed-by=\"$keyring\"]"; return " [signed-by=\"$keyring\"]";
} }
# check if all fingerprints from the keyring that we guessed # check if all fingerprints from the keyring that we guessed
@ -5278,6 +5283,7 @@ sub main() {
# if this fingerprint is not known by apt, then we need # if this fingerprint is not known by apt, then we need
#to add the signed-by option #to add the signed-by option
if (none { $_ eq $1 } @aptfingerprints) { if (none { $_ eq $1 } @aptfingerprints) {
debug "fingerprint $1 is not trusted by apt";
return " [signed-by=\"$keyring\"]"; return " [signed-by=\"$keyring\"]";
} }
} }