From 656d800f8c72bc6bb97700b7289a2d5eebc4e42f Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 2 Jul 2013 14:00:21 +0200
Subject: [PATCH] Use Tempfile.open for automatic cleanup
---
app/models/key.rb | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/app/models/key.rb b/app/models/key.rb
index 11c01242b15..f5fc141985e 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -56,15 +56,10 @@ class Key < ActiveRecord::Base
def generate_fingerpint
cmd_status = 0
cmd_output = ''
- file = Tempfile.new('gitlab_key_file')
-
- begin
+ Tempfile.open('gitlab_key_file') do |file|
file.puts key
file.rewind
cmd_output, cmd_status = popen("ssh-keygen -lf #{file.path}", '/tmp')
- ensure
- file.close
- file.unlink # deletes the temp file
end
if cmd_status.zero?
--
GitLab