aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFOI site testharness <foi-testharness@sandwich.ukcod.org.uk>2010-09-10 01:47:36 +0100
committerFOI site testharness <foi-testharness@sandwich.ukcod.org.uk>2010-09-10 01:47:36 +0100
commit7209feaef2ba0e29af36dd5fb2d55c2e5118ea65 (patch)
treeed4436a3eb0af50ca730065eaec664a1bf033362
parent1a9dc47cf0270aeb8336b071c1c99c408e31de9e (diff)
Cope with either xmlsimple path
-rw-r--r--app/controllers/general_controller.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 00fcb6bf5..0bea01a6f 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -7,7 +7,13 @@
#
# $Id: general_controller.rb,v 1.57 2009-10-03 10:23:43 francis Exp $
-require 'lib/xmlsimple'
+begin
+ require 'xmlsimple'
+rescue LoadError
+ # Debian maintainers put their xmlsimple in a different location :(
+ require 'lib/xmlsimple'
+end
+
require 'open-uri'
class GeneralController < ApplicationController