Merge tag 'sisu_4.0.16' into debian/sid

SiSU 4.0.16

2 files changed, 24 insertions, 8 deletions

diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index ba36c9ad..6577f1fa 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -146,11 +146,9 @@ module SiSU
       number_of_files={}
       @opt.files.each_with_index do |fns,i|
         fn=fns.gsub(/(?:~(?:#{@r}))?\.ss[tm]$/,'')
-        if number_of_files[fn].is_a?(Array)
-          number_of_files[fn] << i
-        else
-          number_of_files.store(fn,[i])
-        end
+        (number_of_files[fn].is_a?(Array)) \
+        ? (number_of_files[fn] << i)
+        : (number_of_files.store(fn,[i]))
       end
       files_translated_idx=[]
       number_of_files.each do |x|
@@ -359,6 +357,14 @@ module SiSU
           require_relative 'dbi_discrete'              # -d dbi_discrete.rb
           SiSU_DBI_Discrete::SQL.new(@opt).build
         end
+        if @opt.act[:manifest][:set]==:on              #% --manifest, -y
+          require_relative 'manifest'                  # -y     manifest.rb
+          ((@opt.act[:sisupod][:set]==:on \
+          || @opt.act[:share_source][:set]==:on) \
+          && @opt.files.length < 2 ) \
+          ? nil
+          : SiSU_Manifest::Source.new(@opt).read
+        end
       end
     end
     def loop_files_on_given_option_pre_do
@@ -413,9 +419,16 @@ module SiSU
               end
             end
           end
-          if @opt.act[:manifest][:set]==:on              #% --manifest, -y
+          if (@opt.act[:sisupod][:set]==:on \
+          || @opt.act[:share_source][:set]==:on) \
+          and @opt.act[:manifest][:set]==:on              #% --manifest, -y
             require_relative 'manifest'                  # -y     manifest.rb
-            SiSU_Manifest::Source.new(@opt).read
+            begin
+            ensure
+              OptionLoopFiles.new(@opt).loop_files_on_given_option_bundle do
+                SiSU_Manifest::Source.new(@opt).read
+              end
+            end
           end
         ensure
           path_pod=@env.processing_path.processing_sisupod(@opt).paths
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index e95a0b1e..92ba76b5 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -2034,7 +2034,8 @@ WOK
         and defined? @rc['image']['public']
           pth="#{@rc['image']['path']}"
           "#{pth}/#{@rc['image']['public']}"
-        else "#{share}/image"
+        else
+          "#{share}/image"
         end
       end
       def image_source_sisu_includes
@@ -2047,6 +2048,8 @@ WOK
           "#{@rc['image']['path']}/#{@rc['image']['public']}"
         elsif FileTest.directory?("#{@@pwd}/#{defaults[:image_stub]}")==true
           "#{@@pwd}/#{defaults[:image_stub]}"
+        elsif FileTest.directory?("#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}")==true
+          "#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}"
         else
           "#{share}/image"
         end