@@ -6,9 +6,12 @@ $:.unshift(File.dirname(__FILE__) + "/../vendor/gems") %w(trollop).each do |library| begin require "#{library}/lib/#{library}" - rescue - puts "There was an error loading #{library}. Try running git submodule init && git submodule update to correct the problem" - require 'trollop' + rescue LoadError + begin + require 'trollop' + rescue LoadError + puts "There was an error loading #{library}. Try running git submodule init && git submodule update to correct the problem" + end end end lib/git-style-binary.rb 4f7984806769e85c49d80aa46860e70985c85845 Nate Murray nate@natemurray.com http://github.com/jashmenn/git-style-binaries/commit/214492264f5b2958692aa7668d0faa2f91e2a74d 214492264f5b2958692aa7668d0faa2f91e2a74d 2009-06-12T09:59:08-07:00 2009-06-12T09:59:08-07:00 updated loading of trollop to be smarter acc907bb31b93c05a2a502d7737d520fbff11311 Nate Murray nate@natemurray.com