aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v4/hub.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-03-18 00:14:43 -0400
committerRalph Amissah <ralph@amissah.com>2013-03-18 00:14:43 -0400
commita70059df3e903c5533c3a35b0508c0e8da1e07de (patch)
treea2697a79a0dbc4f6f91ea003cf7827c791a03e6a /lib/sisu/v4/hub.rb
parentdebian/changelog (4.0.14-1) (diff)
parentv4: share document source, markup text file &/or sisupod (diff)
Merge tag 'sisu_4.0.15' into debian/sid
SiSU 4.0.15
Diffstat (limited to 'lib/sisu/v4/hub.rb')
-rw-r--r--lib/sisu/v4/hub.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index f7cdb1e2..ba36c9ad 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -359,10 +359,6 @@ 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
- SiSU_Manifest::Source.new(@opt).read
- end
end
end
def loop_files_on_given_option_pre_do
@@ -417,11 +413,14 @@ module SiSU
end
end
end
+ if @opt.act[:manifest][:set]==:on #% --manifest, -y
+ require_relative 'manifest' # -y manifest.rb
+ SiSU_Manifest::Source.new(@opt).read
+ end
ensure
path_pod=@env.processing_path.processing_sisupod(@opt).paths
unless @opt.cmd =~/M/
FileUtils::rm_rf("#{path_pod[:sisupod]}/*") if FileTest.directory?(path_pod[:sisupod])
- #FileUtils::rm_rf("#{path_pod[:fnb]}/*") if FileTest.directory?(path_pod[:fnb])
end
end
end