[DRE-commits] [gitlab-shell] 05/07: update patch with better condition check

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab-shell.

commit 3202884c1042d568bd43e2a68b3105ab2d2c7f32
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Nov 10 19:53:40 2015 +0530

    update patch with better condition check
---
 debian/patches/set-root-path.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/patches/set-root-path.patch b/debian/patches/set-root-path.patch
index c72431a..cdb48b4 100644
--- a/debian/patches/set-root-path.patch
+++ b/debian/patches/set-root-path.patch
@@ -2,10 +2,8 @@ Index: gitlab-shell/lib/gitlab_init.rb
 ===================================================================
 --- gitlab-shell.orig/lib/gitlab_init.rb
 +++ gitlab-shell/lib/gitlab_init.rb
-@@ -1,3 +1,5 @@
+@@ -1,3 +1,3 @@
 -ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-+if ENV['SHELL_ROOT_PATH'] == ''
-+	ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-+end
++ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..")) if ROOT_PATH.nil? || ROOT_PATH.empty?
  
  require_relative 'gitlab_config'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab-shell.git