From 1f0232a256c2b64404d4be85af29c1bf9bde3bce Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 12 Oct 2014 10:26:15 -0400 Subject: v5 v6: bin/sisu, hub, urls --maintenance, fix --- lib/sisu/v6/hub.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/sisu/v6/hub.rb') diff --git a/lib/sisu/v6/hub.rb b/lib/sisu/v6/hub.rb index 87c7040e..a5425528 100644 --- a/lib/sisu/v6/hub.rb +++ b/lib/sisu/v6/hub.rb @@ -257,16 +257,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 -- cgit v1.2.3