From 6715da88a04e1f1b74193f0f36903d499d2d8068 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 6 Jun 2012 22:33:17 -0400
Subject: v3: shared_images, fix
---
data/doc/sisu/CHANGELOG_v3 | 2 ++
lib/sisu/v3/shared_images.rb | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index c18d1503..f5f722f2 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -23,6 +23,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.12.orig.tar.xz
* v3: dbi_discreet, screen reporting db location, fix
+* v3: shared_images, fix
+
* Rake, Rant installer sisu installer require ruby >= 1.9.3
%% 3.2.11.orig.tar.xz (2012-06-03:22/7)
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'
--
cgit v1.2.3