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

pass verbosity to hook-listener

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-11-13 22:37:53 +01:00
parent e71487af5e
commit 21a26b5dac
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coverage.sh
View file

@ -2078,7 +2078,7 @@ mkdir /tmp/root/real
run_testA() { run_testA() {
echo content > /tmp/foo echo content > /tmp/foo
{ { { $CMD --hook-helper /tmp/root root setup env 1 upload /tmp/foo \$1 < /tmp/myfifo 3>&-; echo \$? >&3; printf "\\000\\000adios"; { { { $CMD --hook-helper /tmp/root root setup env 1 upload /tmp/foo \$1 < /tmp/myfifo 3>&-; echo \$? >&3; printf "\\000\\000adios";
} | $CMD --hook-listener 3>&- >/tmp/myfifo; echo \$?; } 3>&1; } | $CMD --hook-listener 1 3>&- >/tmp/myfifo; echo \$?; } 3>&1;
} | { read xs1; [ "\$xs1" -eq 0 ]; read xs2; [ "\$xs2" -eq 0 ]; } } | { read xs1; [ "\$xs1" -eq 0 ]; read xs2; [ "\$xs2" -eq 0 ]; }
echo content | diff -u - /tmp/root/real/foo echo content | diff -u - /tmp/root/real/foo
rm /tmp/foo rm /tmp/foo

5
mmdebstrap
View file

@ -3295,6 +3295,7 @@ sub hooklistener {
# errors without goto labels or much code duplication: the error handler # errors without goto labels or much code duplication: the error handler
# has to send an "error" message to the other side # has to send an "error" message to the other side
eval { eval {
$verbosity_level = $ARGV[1];
while (1) { while (1) {
# get the next message # get the next message
my $msg = "error"; my $msg = "error";
@ -3955,7 +3956,7 @@ sub main() {
# this is the counterpart to --hook-helper and will receive and carry # this is the counterpart to --hook-helper and will receive and carry
# out its instructions # out its instructions
if (scalar @ARGV == 1 && $ARGV[0] eq "--hook-listener") { if (scalar @ARGV == 2 && $ARGV[0] eq "--hook-listener") {
hooklistener(); hooklistener();
exit 0; exit 0;
} }
@ -5316,7 +5317,7 @@ sub main() {
if ($is_covering) { if ($is_covering) {
@prefix = ($EXECUTABLE_NAME, "-MDevel::Cover=-silent,-nogcov"); @prefix = ($EXECUTABLE_NAME, "-MDevel::Cover=-silent,-nogcov");
} }
exec @prefix, $PROGRAM_NAME, "--hook-listener"; exec @prefix, $PROGRAM_NAME, "--hook-listener", $verbosity_level;
} }
waitpid($lpid, 0); waitpid($lpid, 0);
if ($? != 0) { if ($? != 0) {