Merge tag 'sisu_5.5.1' into debian/sid

SiSU 5.5.1

1 files changed, 5 insertions, 3 deletions

diff --git a/bin/sisu b/bin/sisu
index 51840e07..ffc5a8a5 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -179,6 +179,8 @@ class Orient
       path_lib:              sisu_path_lib,
       version_info_path:     sisu_version_info_path,
       language_list:         language_list.codes,
+      language_list_regex:   language_list.regex,
+      called_from:           sisu_called_from_directory,
     }
   end
   def get_processing_info
@@ -233,7 +235,7 @@ class Orient
             Dir.chdir(markup_dir)
             $sisu_document_markup_directory_base_fixed_path=
               Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
-            SiSU::HubMaster.new(argv_sub)
+            SiSU::HubMaster.new(argv_sub,sisu_called_from_directory)
           elsif markup_dir =~/https?:/
             markup_file.each do |mf|
               (FileTest.file?(mf)) \
@@ -244,7 +246,7 @@ class Orient
             $sisu_document_markup_directory_base_fixed_path=
               Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
             argv_sub=command_line_modifiers + markup_file
-            SiSU::HubMaster.new(argv_sub)
+            SiSU::HubMaster.new(argv_sub,sisu_called_from_directory)
           else p "Error directory specified #{markup_dir} not found"
           end
         ensure
@@ -256,7 +258,7 @@ class Orient
       $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'')
       $sisu_document_markup_directory_base_fixed_path=
         Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'')
-      SiSU::HubMaster.new(processing.argv)
+      SiSU::HubMaster.new(processing.argv,sisu_called_from_directory)
     end
   end
 end