[DRE-commits] [test-kitchen] 12/39: Add missing patch, rename existing

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository test-kitchen.

commit 8a196319305646fe75f48bbee032482165a2aef8
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Wed Jul 8 11:13:52 2015 +0300

    Add missing patch, rename existing
---
 ...ve-CI-staff.patch => 0003-Remove-CI-stuff.patch} |  2 +-
 ...nge-LOAD_PATH-and-do-not-use-rubygems-in-b.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0003-Remove-CI-staff.patch b/debian/patches/0003-Remove-CI-stuff.patch
similarity index 97%
rename from debian/patches/0003-Remove-CI-staff.patch
rename to debian/patches/0003-Remove-CI-stuff.patch
index f99a73d..d009831 100644
--- a/debian/patches/0003-Remove-CI-staff.patch
+++ b/debian/patches/0003-Remove-CI-stuff.patch
@@ -1,6 +1,6 @@
 From: Hleb Valoshka <375gnu at gmail.com>
 Date: Mon, 29 Jun 2015 20:33:22 +0300
-Subject: Remove CI staff
+Subject: Remove CI stuff
 
 ---
  spec/spec_helper.rb | 17 -----------------
diff --git a/debian/patches/0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch b/debian/patches/0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
new file mode 100644
index 0000000..6b75115
--- /dev/null
+++ b/debian/patches/0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
@@ -0,0 +1,21 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Tue, 30 Jun 2015 11:00:18 +0300
+Subject: Do not change LOAD_PATH and do not use rubygems in binary
+
+---
+ bin/kitchen | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/bin/kitchen b/bin/kitchen
+index 374fad3..05c94d6 100755
+--- a/bin/kitchen
++++ b/bin/kitchen
+@@ -5,8 +5,6 @@
+ # https://twitter.com/mitchellh/status/283014103189053442
+ Signal.trap("INT") { exit 1 }
+ 
+-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w[.. lib])
+-require "rubygems"
+ require "kitchen/cli"
+ require "kitchen/errors"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8c277e3..af7c12e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 0001-Do-not-run-test-for-winrm-transport.patch
 0002-Remove-useless-gem-minitest-from-spec_helper.patch
-0003-Remove-CI-staff.patch
+0003-Remove-CI-stuff.patch
 0004-Fix-monkey-patching-of-IO.read.patch
 0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
 0006-Search-for-support-in-usr-share-test-kitchen.patch

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