[Swift-commit] r3313 - SwiftApps/adem-osg

[noreply at svn.ci.uchicago.edu]

Author: aespinosa
Date: 2010-05-03 14:56:34 -0500 (Mon, 03 May 2010)
New Revision: 3313

Modified:
   SwiftApps/adem-osg/adem.rb
Log:
Moved sites() method

Modified: SwiftApps/adem-osg/adem.rb
===================================================================
--- SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:32 UTC (rev 3312)
+++ SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:34 UTC (rev 3313)
@@ -31,6 +31,15 @@
   conf
 end
 
+def sites(args, conf, sites_file)
+  begin
+    YAML.load File.open sites_file
+  rescue Errno::ENOENT
+    result = ress_parse ress_query(conf).split("\n\n")
+    raise SiteError.new(result)
+  end
+end
+
 def ress_query(conf)
   `condor_status -pool #{conf[:ress_server]} -const \
     'stringListIMember(\"VO:#{conf[:virtual_organization]}\", \  
@@ -95,15 +104,6 @@
   site
 end
 
-def sites(args, conf, sites_file)
-  begin
-    YAML.load File.open sites_file
-  rescue Errno::ENOENT
-    result = ress_parse ress_query(conf).split("\n\n")
-    raise SiteError.new(result)
-  end
-end
-
 def app(args, conf)
   "app"
 end