diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-06-06 23:54:36 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-06-06 23:54:36 -0400 |
commit | e02c0129e10e4ed8e102978df31a7e370f5b868b (patch) | |
tree | 475e987720aaccce8f6c0cadb53649a589b893a2 /lib/sisu/v3/shared_images.rb | |
parent | debian/changelog (3.2.11-1) (diff) | |
parent | v3: hub, post bundles, sisupod_make, file selection selection for tar.xz, fix (diff) |
Merge tag 'sisu_3.2.12' into debian/sid
Diffstat (limited to 'lib/sisu/v3/shared_images.rb')
-rw-r--r-- | lib/sisu/v3/shared_images.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sisu/v3/shared_images.rb b/lib/sisu/v3/shared_images.rb index 03093c6a..c92719f6 100644 --- a/lib/sisu/v3/shared_images.rb +++ b/lib/sisu/v3/shared_images.rb @@ -130,7 +130,8 @@ module SiSU_Images rgx_rb_image=/["']\S*?([a-zA-Z0-9_-]+?\.(?:png|jpg|gif))["']/ skin_source=SiSU_Env::InfoSkin.new(@md).apply docskin=nil - if skin_source[:type] == :dir + if skin_source \ + and skin_source[:type] == :dir docskin_with_path="#{docskin_place}/skin_#{@env.stub_pwd}.rb" docskin=[docskin_with_path.gsub(/.+?\/(skin_\S+?)\.rb/,'\1')] #docskin='skin_sisupod' |