[tbb-commits] [rbm/master] Merge remote-tracking branch 'boklm/bug_24361'

[gk at torproject.org]

commit a5a1748894ae3e84cb81467b972010969f1b5c88
Merge: 6406e06 8b6831b
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Nov 27 11:06:25 2017 +0000

    Merge remote-tracking branch 'boklm/bug_24361'

 lib/RBM.pm | 69 ++++++++++++++++++++++++++++++++------------------------------
 test.pl    |  4 ++--
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --cc lib/RBM.pm
index 7850817,9080ccf..b2ef57f
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@@ -836,10 -832,12 +839,10 @@@ sub input_files 
                  if $input_file->{project};
          exit_error("Missing filename:\n" . pp($input_file)) unless $name;
          my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir);
 -        $need_dl = input_file_id_need_dl($input_file, $t, $fname)
 -                        if $action eq 'input_files_id';
          my $file_gpg_id = gpg_id($t->('file_gpg_id'));
 -        if ($need_dl && (!$fname || $t->('refresh_input'))) {
 +        if (input_file_need_dl($input_file, $t, $fname, $action)) {
              if ($t->('content')) {
-                 write_file("$proj_out_dir/$name", $t->('content'));
+                 path("$proj_out_dir/$name")->spew_utf8($t->('content'));
              } elsif ($t->('URL')) {
                  urlget($project, {%$input_file, filename => $name}, 1);
              } elsif ($t->('exec')) {