[csw-devel] SF.net SVN: opencsw:[416] catalog_signatures

[bdwalton at users.sourceforge.net]

Revision: 416
          http://opencsw.svn.sourceforge.net/opencsw/?rev=416&view=rev
Author:   bdwalton
Date:     2011-07-21 03:04:34 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
pass gpg options to GPGDaemon when webrick initializes it

Signed-off-by: Ben Walton <bwalton at opencsw.org>

Modified Paths:
--------------
    catalog_signatures/bin/catalog_gpg
    catalog_signatures/lib/csw/gpg_daemon.rb

Modified: catalog_signatures/bin/catalog_gpg
===================================================================
--- catalog_signatures/bin/catalog_gpg	2011-07-21 03:04:07 UTC (rev 415)
+++ catalog_signatures/bin/catalog_gpg	2011-07-21 03:04:34 UTC (rev 416)
@@ -54,7 +54,7 @@
     VALID_ARCHES.each do |arch|
       VALID_RELEASES.each do |release|
         path = "#{tree}/#{arch}/#{release}"
-        server.mount "/#{signtype}/#{path}", GPGDaemon, opts.mirror_path, path
+        server.mount "/#{signtype}/#{path}", GPGDaemon, opts.mirror_path, path, opts.gpg
       end
     end
   end

Modified: catalog_signatures/lib/csw/gpg_daemon.rb
===================================================================
--- catalog_signatures/lib/csw/gpg_daemon.rb	2011-07-21 03:04:07 UTC (rev 415)
+++ catalog_signatures/lib/csw/gpg_daemon.rb	2011-07-21 03:04:34 UTC (rev 416)
@@ -1,7 +1,7 @@
 require 'webrick'
 
 class GPGDaemon < WEBrick::HTTPServlet::AbstractServlet
-  def initialize(server, mirror_path, catalogpath)
+  def initialize(server, mirror_path, catalogpath, gpg)
     @mirror_path = mirror_path
     @catalog_path = catalogpath
     @full_path = File.join(@mirror_path, @catalog_path)


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