From 36c2c354fc4829827960d202a070f8e7b87c9446 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 25 Feb 2014 12:00:33 +0100 Subject: [PATCH] Adapt use of Gitlab::Popen to new style --- app/models/key.rb | 2 +- lib/gitlab/satellite/satellite.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/key.rb b/app/models/key.rb index 79f7bbd2590..29a76f53f3d 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -53,7 +53,7 @@ class Key < ActiveRecord::Base Tempfile.open('gitlab_key_file') do |file| file.puts key 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 if cmd_status.zero? diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 353c3024aad..bcf3012bd92 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -33,7 +33,7 @@ module Gitlab end 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) log("PID: #{project.id}: git clone #{project.repository.path_to_repo} #{path}")