[DRE-commits] [gitlab-shell] 03/03: refresh patches

[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 a1390961774489dec3ad51a2c47b965581bf9f81
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 25 21:47:24 2016 +0530

    refresh patches
---
 debian/changelog                     |  1 +
 debian/patches/use-system-libs.patch | 46 +++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5450ebb..ff8f755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gitlab-shell (3.4.0-1) unstable; urgency=medium
 
   * New upstream release
+  * Refresh patches
 
  -- Pirate Praveen <praveen at debian.org>  Thu, 25 Aug 2016 21:39:53 +0530
 
diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
index 2c309bc..6ead5da 100644
--- a/debian/patches/use-system-libs.patch
+++ b/debian/patches/use-system-libs.patch
@@ -28,8 +28,8 @@ Index: gitlab-shell/bin/create-hooks
 +require 'gitlab_init'
 +require 'gitlab_projects'
  
- Dir["#{GitlabConfig.new.repos_path}/*/*.git"].each do |repo|
-   begin
+ repository_storage_paths = ARGV
+ 
 Index: gitlab-shell/bin/gitlab-keys
 ===================================================================
 --- gitlab-shell.orig/bin/gitlab-keys
@@ -94,7 +94,7 @@ Index: gitlab-shell/bin/gitlab-shell
 +++ gitlab-shell/bin/gitlab-shell
 @@ -8,14 +8,14 @@ end
  key_id = /key-[0-9]+/.match(ARGV.join).to_s
- original_cmd = ENV['SSH_ORIGINAL_COMMAND']
+ original_cmd = ENV.delete('SSH_ORIGINAL_COMMAND')
  
 -require_relative '../lib/gitlab_init'
 +require 'gitlab_init'
@@ -113,9 +113,9 @@ Index: gitlab-shell/hooks/post-receive
 ===================================================================
 --- gitlab-shell.orig/hooks/post-receive
 +++ gitlab-shell/hooks/post-receive
-@@ -10,8 +10,9 @@ repo_path = Dir.pwd
- # reset GL_ID env since we already got its value
- ENV['GL_ID'] = nil
+@@ -7,8 +7,9 @@ refs = $stdin.read
+ key_id  = ENV.delete('GL_ID')
+ repo_path = Dir.pwd
  
 -require_relative '../lib/gitlab_custom_hook'
 -require_relative '../lib/gitlab_post_receive'
@@ -125,22 +125,6 @@ Index: gitlab-shell/hooks/post-receive
  
  if GitlabPostReceive.new(repo_path, key_id, refs).exec &&
      GitlabCustomHook.new.post_receive(refs, repo_path)
-Index: gitlab-shell/hooks/pre-receive
-===================================================================
---- gitlab-shell.orig/hooks/pre-receive
-+++ gitlab-shell/hooks/pre-receive
-@@ -7,8 +7,9 @@ refs = ARGF.read
- key_id  = ENV['GL_ID']
- repo_path = Dir.pwd
- 
--require_relative '../lib/gitlab_custom_hook'
--require_relative '../lib/gitlab_access'
-+$:.unshift File.expand_path('../lib', __FILE__)
-+require 'gitlab_custom_hook'
-+require 'gitlab_access'
- 
- if GitlabAccess.new(repo_path, key_id, refs).exec &&
-     GitlabCustomHook.new.pre_receive(refs, repo_path)
 Index: gitlab-shell/hooks/update
 ===================================================================
 --- gitlab-shell.orig/hooks/update
@@ -155,3 +139,21 @@ Index: gitlab-shell/hooks/update
  
  if GitlabCustomHook.new.update(ref_name, old_value, new_value, repo_path)
    exit 0
+Index: gitlab-shell/hooks/pre-receive
+===================================================================
+--- gitlab-shell.orig/hooks/pre-receive
++++ gitlab-shell/hooks/pre-receive
+@@ -8,9 +8,10 @@ key_id = ENV.delete('GL_ID')
+ protocol = ENV.delete('GL_PROTOCOL')
+ repo_path = Dir.pwd
+ 
+-require_relative '../lib/gitlab_custom_hook'
+-require_relative '../lib/gitlab_reference_counter'
+-require_relative '../lib/gitlab_access'
++$:.unshift File.expand_path('../lib', __FILE__)
++require 'gitlab_custom_hook'
++require 'gitlab_access'
++require 'gitlab_reference_counter'
+ 
+ # It's important that on pre-receive `increase_reference_counter` gets executed
+ # last so that it only runs if everything else succeeded. On post-receive on the

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