[DRE-commits] [gitlab-shell] 01/03: fix gitlab_init loading

[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 4ec7951d2c72ee3509d5594439bd16da75c43195
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Dec 29 00:07:53 2015 +0530

    fix gitlab_init loading
---
 debian/patches/use-system-libs.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
index bac1d4e..f4ce7b7 100644
--- a/debian/patches/use-system-libs.patch
+++ b/debian/patches/use-system-libs.patch
@@ -74,13 +74,12 @@ Index: gitlab-shell/bin/gitlab-shell
 ===================================================================
 --- gitlab-shell.orig/bin/gitlab-shell
 +++ gitlab-shell/bin/gitlab-shell
-@@ -8,14 +8,15 @@ end
+@@ -8,14 +8,14 @@ end
  key_id = /key-[0-9]+/.match(ARGV.join).to_s
  original_cmd = ENV['SSH_ORIGINAL_COMMAND']
  
 -require_relative '../lib/gitlab_init'
-+$:.unshift File.expand_path('../lib', __FILE__)
-+require_relative 'gitlab_init'
++require 'gitlab_init'
  
  #
  #

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