Commit 36c2c354 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Adapt use of Gitlab::Popen to new style

parent 38f4b61a
...@@ -53,7 +53,7 @@ class Key < ActiveRecord::Base ...@@ -53,7 +53,7 @@ class Key < ActiveRecord::Base
Tempfile.open('gitlab_key_file') do |file| Tempfile.open('gitlab_key_file') do |file|
file.puts key file.puts key
file.rewind file.rewind
cmd_output, cmd_status = popen("ssh-keygen -lf #{file.path}", '/tmp') cmd_output, cmd_status = popen(%W(ssh-keygen -lf #{file.path}), '/tmp')
end end
if cmd_status.zero? if cmd_status.zero?
......
...@@ -33,7 +33,7 @@ module Gitlab ...@@ -33,7 +33,7 @@ module Gitlab
end end
def create def create
output, status = popen("git clone #{project.repository.path_to_repo} #{path}", output, status = popen(%W(git clone -- #{project.repository.path_to_repo} #{path}),
Gitlab.config.satellites.path) Gitlab.config.satellites.path)
log("PID: #{project.id}: git clone #{project.repository.path_to_repo} #{path}") log("PID: #{project.id}: git clone #{project.repository.path_to_repo} #{path}")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment