[DRE-commits] [gitlab-shell] 06/07: update conditional

[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 08fcbd2ee7f3269228c50d16882133ffd6991a9f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Nov 10 20:38:23 2015 +0530

    update conditional
---
 debian/patches/set-root-path.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

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