From 7209feaef2ba0e29af36dd5fb2d55c2e5118ea65 Mon Sep 17 00:00:00 2001
From: FOI site testharness <foi-testharness@sandwich.ukcod.org.uk>
Date: Fri, 10 Sep 2010 01:47:36 +0100
Subject: Cope with either xmlsimple path

---
 app/controllers/general_controller.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/controllers/general_controller.rb')

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
-- 
cgit v1.2.3