diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 6769a187..7bcc728f 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -20,6 +20,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.14.orig.tar.gz sisu_3.0.14-1.dsc sisu_3.0.14-1.debian.tar.gz + * sysenv, avoid creation of spurious directories in output tree + (an image copy section removed, re-implement correctly later) + * urls, --concordance %% 3.0.13.orig.tar.gz (2011-06-26:25/7) diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index d709cd52..4a168e2d 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -2142,20 +2142,10 @@ WOK #end def images_local if FileTest.directory?(path.image_source_include) - if @@image_flag - images=Dir.glob("#{path.image_source_include}/*.{png,jpg,gif}") - pth="#{path.webserv}/#{@stub_pwd}" - mkdir_p("#{pth}/_sisu/image") unless FileTest.directory?("#{pth}/_sisu/image") - images.each { |i| File.install(i,"#{pth}/#{i}") } unless images.length > 0 - @@image_flag=false - end path.image_source_include -# "#{Xx[:html_relative2]}/_sisu/image" else if @@local_image==true - cmd=if @cmd; @cmd - else '' - end + cmd=@cmd ? @cmd : '' SiSU_Screen::Ansi.new(cmd,"WARNING - no local image directory or images:", defaults[:image_local] ).warn unless cmd =~/q/ @@local_image=false end |