GitLab

at 2024-01-24T10:24:19+01:00

Bug 40067: Use --no-verbose wget option when not running in a terminal

Use the `--no-verbose` option when stdout is not a tty. We avoid setting
the option when `getting_id` is set, in order to have constant
`input_file_id` when `urlget` is being used inside the `exec` script in
`input_files`.

@@ -21,6 +21,9 @@ abbrev_length::
          This option sets the length of the abbreviated commits, when
          using the +abbrev+ option.
 +isatty::
 +        This option is true when stdout is connected to a tty.
++
  tar::
          Use this options instead of 'tar' in build scripts when you want
          to create deterministic tar files. This options set tar arguments

@@ -151,6 +151,7 @@ our %default_config = (
      debug         => 0,
      compress_tar  => 'gz',
      version       => "[%- exit_error('No version specified for ' _ project); -%]",
 +    isatty        => sub { -t STDOUT },
  ####
  ####
  ####
@@ -577,7 +578,7 @@ set -e
      END;
      -%]
  tmpfile="\$(mktemp -p [% shell_quote(rbm_tmp_dir) %])"
 -wget -O"\$tmpfile" [% shell_quote(c("URL")) %]
 +wget[% IF !c("getting_id") && !c("isatty") %] --no-verbose[% END %] -O"\$tmpfile" [% shell_quote(c("URL")) %]
  mv -f "\$tmpfile" [% shell_quote(dest_dir _ "/" _ c("filename")) %]
  URLGET
      sig_ext => [ qw(gpg asc sig) ],

richard pushed to branch main at The Tor Project / Applications / RBM

Commits:

2 changed files:

Changes: