commit 072d3ab7f61733a071ca13a66bdb1fe1922e1e41 Author: Nicolas Vigier boklm@torproject.org Date: Mon Nov 6 18:44:41 2017 +0100

Bug 24156: remove dash in build_log when var/osname is not defined

In projects/debootstrap-image, the option var/osname is not defined, so the build_log filename was logs/debootstrap-image-.log. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf index 6e800f2..83c2086 100644 --- a/rbm.conf +++ b/rbm.conf @@ -3,7 +3,7 @@ debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" tmp_dir: '[% c("basedir") %]/tmp' -build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]-[% c("var/osname") %].log' +build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %][% IF c("var/osname") %]-[% c("var/osname") %][% END %].log'

pkg_type: build