diff options
author | Ralph Amissah <ralph@amissah.com> | 2008-01-19 03:19:48 +0000 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2008-01-19 03:19:48 +0000 |
commit | f0535eee2cd19e3b602445c64ec0b5cd4b21ec93 (patch) | |
tree | d146631a9239f1cea7ba867ad09d6838e2ffb3d5 /lib/sisu/v0/composite.rb | |
parent | permit to run on ruby 1.9, debian unstable requires it (debian/control) (diff) | |
parent | mkdir_p, and again close running of ruby 1.9 (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/composite.rb')
-rw-r--r-- | lib/sisu/v0/composite.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb index fb393384..e0b53bb5 100644 --- a/lib/sisu/v0/composite.rb +++ b/lib/sisu/v0/composite.rb @@ -71,7 +71,7 @@ module SiSU_Assemble end def download_images(download_from,images_array) path="#{@env.path.processing}/external_document/image" - File.mkpath(path) unless FileTest.directory?(path) + mkdir_p(path) unless FileTest.directory?(path) images_array.each do |i| image="#{path}/#{i}" imagefile=File.new(image,'w+') @@ -81,12 +81,12 @@ module SiSU_Assemble imagefile.close end output_path="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external" - File.mkpath(output_path) unless FileTest.directory?(output_path) + mkdir_p(output_path) unless FileTest.directory?(output_path) SiSU_Env::System_call.new("#{path}/*",output_path,'q').rsync end def download_doc_skin(doc_skin) #first element in array is source url path="#{@env.path.processing}/external_document/skin/doc" - File.mkpath(path) unless FileTest.directory?(path) + mkdir_p(path) unless FileTest.directory?(path) download_from=doc_skin.shift doc_skin.each do |i| skin="#{path}/#{i}.rb" @@ -122,7 +122,7 @@ module SiSU_Assemble end def download_images(download_from,images_array) path="#{@env.path.processing}/external_document/image" - File.mkpath(path) unless FileTest.directory?(path) + mkdir_p(path) unless FileTest.directory?(path) images_array.each do |i| image="#{path}/#{i}" unless FileTest.exists?(image) @@ -136,7 +136,7 @@ module SiSU_Assemble end def download_doc_skin(doc_skin) #first element in array is source url path="#{@env.path.processing}/external_document/skin/doc" - File.mkpath(path) unless FileTest.directory?(path) + mkdir_p(path) unless FileTest.directory?(path) download_from=doc_skin.shift doc_skin.each do |i| skin="#{path}/#{i}.rb" |