[csw-devel] SF.net SVN: opencsw:[401] catalog_signatures/catalog_gpg

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Thu Jul 21 04:58:53 CEST 2011


Revision: 401
          http://opencsw.svn.sourceforge.net/opencsw/?rev=401&view=rev
Author:   bdwalton
Date:     2011-07-21 02:58:53 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
handle gpg_daemon library loading in the face of dev lib path

Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>

Modified Paths:
--------------
    catalog_signatures/catalog_gpg

Modified: catalog_signatures/catalog_gpg
===================================================================
--- catalog_signatures/catalog_gpg	2011-07-21 02:58:36 UTC (rev 400)
+++ catalog_signatures/catalog_gpg	2011-07-21 02:58:53 UTC (rev 401)
@@ -4,9 +4,16 @@
 require 'webrick'
 
 begin
+  retried = nil
   require 'csw/gpg_daemon'
-rescue => e
-  puts e.class
+rescue LoadError => e
+  if retried.nil?
+    $:.unshift(File.join(File.dirname($0), 'lib'))
+    retried = 1
+    retry
+  else
+    reraise
+  end
 end
 
 mirror_path = File.dirname($0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list