Merge branch 'fix_no_opts'

bricolages · Jul 12, 2017 · b8dc063 · b8dc063
2 parents 3bd8009 + 850c0b6
commit b8dc063
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,9 @@
 # Bricolage Release Note
 
+## version 5.24.2
+
+- [fix] --log-dir, --log-path and --s3-log options are wrongly not ommittable
+
 ## version 5.24.1
 
 - [fix] --enable-queue did not work

diff --git a/lib/bricolage/application.rb b/lib/bricolage/application.rb
@@ -258,9 +258,9 @@ def common_options
     end
 
     def log_path_format
-      if opt = @opts['log-dir']
+      if opt = @opts['log-dir'] and opt.value
         LogFilePath.new("#{opt.value}/%{std}.log")
-      elsif opt = @opts['log-path']
+      elsif opt = @opts['log-path'] and opt.value
         LogFilePath.new(opt.value)
       else
         nil
@@ -277,8 +277,7 @@ def log_s3_key_format
 
     def s3_log_spec
       @s3_log_spec ||=
-        if opt = @opts['s3-log']
-          spec = opt.value
+        if opt = @opts['s3-log'] and spec = opt.value
           ds, k = spec.split(':', 2)
           k = k.to_s.strip
           key = k.empty? ? nil : k

diff --git a/lib/bricolage/version.rb b/lib/bricolage/version.rb
@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.24.1'
+  VERSION = '5.24.2'
 end