diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-10-12 10:56:59 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-10-12 10:56:59 -0400 |
| commit | 2e4c214d4d2323864985ccfe93346a9796edee2f (patch) | |
| tree | bd450b52b31b81fc46150ebee9d4e06bc7e1e560 /lib/sisu/v5/hub.rb | |
| parent | debian/changelog (5.6.9-1) (diff) | |
| parent | v5: merge v6: remove defaults.rb & some relics related to sisu skins (diff) | |
Merge tag 'sisu_5.7.0' into debian/sid
SiSU 5.7.0
Diffstat (limited to 'lib/sisu/v5/hub.rb')
| -rw-r--r-- | lib/sisu/v5/hub.rb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb index 10ac6f23..a4751e40 100644 --- a/lib/sisu/v5/hub.rb +++ b/lib/sisu/v5/hub.rb @@ -68,8 +68,6 @@ module SiSU require_relative 'hub_options' # hub_options.rb require_relative 'dp' # dp.rb include SiSU_Param - require_relative 'defaults' # defaults.rb - include SiSU_Viz require_relative 'utils' # utils.rb begin require 'uri' @@ -257,16 +255,17 @@ module SiSU end end class HubClose - def initialize(call_path) + def initialize(call_path,argv) begin - @env=SiSU_Env::InfoEnv.new + env=SiSU_Env::InfoEnv.new rescue ensure - if FileTest.directory?(@env.processing_path.processing) \ - and FileTest.directory?(@env.processing_path.processing_base_tmp) \ - and @env.processing_path.processing_base_tmp =~/#{@env.processing_path.processing}/ \ - and @env.processing_path.processing_base_tmp =~/^\/tmp\/\S+/ - FileUtils::cd(@env.processing_path.processing_base_tmp) do + if FileTest.directory?(env.processing_path.processing) \ + and FileTest.directory?(env.processing_path.processing_base_tmp) \ + and env.processing_path.processing_base_tmp =~/#{env.processing_path.processing}/ \ + and env.processing_path.processing_base_tmp =~/^\/tmp\/\S+/ \ + and not argv.inspect =~/"--maintenance"|"-M"/ + FileUtils::cd(env.processing_path.processing_base_tmp) do FileUtils::rm_rf('.') end end |