kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ensure_satellite_exists' into 'master' 

Ensure satellite exists instead of raising an error
This commit is contained in:
Dmitriy Zaporozhets 2014-04-09 17:50:26 +00:00
parent 4e9add7c2c 63ba983511
commit f23dcac91b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gitlab/satellite/satellite.rb
View File

@ -22,7 +22,7 @@ module Gitlab
end
def clear_and_update!
raise SatelliteNotExistError unless exists?
project.ensure_satellite_exists
@repo = nil
clear_working_dir!
@ -54,7 +54,7 @@ module Gitlab
# * Changes the current directory to the satellite's working dir
# * Yields
def lock
raise SatelliteNotExistError unless exists?
project.ensure_satellite_exists
File.open(lock_file, "w+") do |f|
begin
@ -76,7 +76,7 @@ module Gitlab
end
def repo
raise SatelliteNotExistError unless exists?
project.ensure_satellite_exists
@repo ||= Grit::Repo.new(path)
end