This is an automated email from the git hooks/post-receive script.
gk pushed a commit to branch master in repository builders/rbm.
The following commit(s) were added to refs/heads/master by this push: new 98be5a6 Bug 40042: Stop using `touch_arg` in `touch` 98be5a6 is described below
commit 98be5a6247850ecbdf9641a96b176a071dab2f5b Author: Nicolas Vigier boklm@torproject.org AuthorDate: Mon Jul 4 09:50:25 2022 +0200
Bug 40042: Stop using `touch_arg` in `touch`
Instead we expect the argument to follow on the same line. --- doc/options_misc.asc | 3 +-- lib/RBM/DefaultConfig.pm | 8 +------- 2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 084348d..124f05b 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -52,5 +52,4 @@ num_procs::
touch:: This option can be used to set the mtime of files to +timestamp+. - It takes a +touch_args+ argument which is the intended file to - touch. + It expects the file to touch as as argument following on the same line. diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index a638fc0..e28642f 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -475,13 +475,7 @@ ZIP_END #### #### #### - touch => <<TOUCH_END, -[% USE date -%] -touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %] [% c('touch_args', { error_if_undef => 1 }) %] -TOUCH_END -#### -#### -#### + touch => "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]", arch => &get_arch, input_files_by_name => sub { RBM::input_files('getfnames', @_); }, input_files_id => sub { RBM::input_files('input_files_id', @_); },