diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-02-05 01:28:30 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-02-05 01:28:30 -0500 |
commit | ba017314c06829b8d8a92a85d2111a8582c4e1cc (patch) | |
tree | ae413a3c2eacce20422b238e0a57c16d5632adf8 /lib/sisu/v6/composite.rb | |
parent | debian/changelog (5.3.0-1) (diff) | |
parent | README & manpage (sisu.1) update (diff) |
Merge tag 'sisu_5.3.1' into debian/sid
SiSU 5.3.1
Diffstat (limited to 'lib/sisu/v6/composite.rb')
-rw-r--r-- | lib/sisu/v6/composite.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sisu/v6/composite.rb b/lib/sisu/v6/composite.rb index 044f31c4..ebbd14f6 100644 --- a/lib/sisu/v6/composite.rb +++ b/lib/sisu/v6/composite.rb @@ -178,10 +178,14 @@ module SiSU_Assemble end tuned_file << if loadfile =~ /(?:https?|file):\/\/\S+?\.ss[ti]$/ # and NetTest imagedir = /((?:https?|file):\/\/\S+?)\/[^\/]+?\.ss[ti]$/.match(loadfile).captures.join + '/_sisu/image' #watch - require 'uri' + begin + require 'uri' + require 'open-uri' + require 'pp' + rescue LoadError + SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('uri, open-uri or pp NOT FOUND (LoadError)') + end image_uri=URI.parse(imagedir) - require 'open-uri' - require 'pp' insert=open(loadfile) insert_array=insert.dup insert.close |