On 02/16/2011 06:09 PM, Ian Main wrote:
Keypair no longer needs to be escaped because it is on its own
classad
line now.
Signed-off-by: Ian Main<imain(a)redhat.com>
---
src/app/util/condormatic.rb | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index a129d06..1de5c29 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -20,11 +20,6 @@
require 'nokogiri'
require 'socket'
-def escape(str)
- str = str.gsub('\\', '\\\\')
- str = str.gsub(' ', '\\ ')
-end
-
def condormatic_instance_create(task)
begin
@@ -251,7 +246,7 @@ def condormatic_classads_sync
pipe.puts "username=\"#{account.username}\""
pipe.puts "password=\"#{account.password}\""
pipe.puts "provider_account_id=\"#{account.id}\""
- pipe.puts "keypair=\"#{escape(account.instance_key.name)}\""
+ pipe.puts "keypair=\"#{account.instance_key.name}\""
rescue Exception => ex
Rails.logger.error "Error writing provider classad to condor."
Rails.logger.error ex.message
ACK and pushed.
Scott