summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2014-11-06 11:47:38 +0200
committerValery Sizov <vsv2711@gmail.com>2014-11-06 13:07:42 +0200
commitbf8b87411701667a8d9e608b2e7b3171c4c3e551 (patch)
treeb413e53d02434990535723d63ece1b7f14cae96c /lib
parentd1b489e048e2bd9304ae335d9105e6efde99012b (diff)
downloadgitlab-ce-bf8b87411701667a8d9e608b2e7b3171c4c3e551.tar.gz
fix system silent call
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git_ref_validator.rb2
-rw-r--r--lib/gitlab/utils.rb5
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/git_ref_validator.rb b/lib/gitlab/git_ref_validator.rb
index 0fdd4dbe577..39d17def930 100644
--- a/lib/gitlab/git_ref_validator.rb
+++ b/lib/gitlab/git_ref_validator.rb
@@ -6,7 +6,7 @@ module Gitlab
# Returns true for a valid reference name, false otherwise
def validate(ref_name)
Gitlab::Utils.system_silent(
- %W(git check-ref-format refs/#{ref_name})) == 0
+ %W(git check-ref-format refs/#{ref_name}))
end
end
end
diff --git a/lib/gitlab/utils.rb b/lib/gitlab/utils.rb
index bc30364550a..bd184c27187 100644
--- a/lib/gitlab/utils.rb
+++ b/lib/gitlab/utils.rb
@@ -5,10 +5,9 @@ module Gitlab
# Run system command without outputting to stdout.
#
# @param cmd [Array<String>]
- # @return [Integer] exit status
+ # @return [Boolean]
def system_silent(cmd)
- IO.popen(cmd).close
- $?.exitstatus
+ Popen::popen(cmd).last.zero?
end
end
end