[DRE-commits] [test-kitchen] 14/39: Patch for templates

[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 689f1be81282cbb3734f6231b744851584e641ca
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Wed Jul 8 11:38:25 2015 +0300

    Patch for templates
---
 ...mplates-in-usr-share-test-kitchen-templat.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch b/debian/patches/0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch
new file mode 100644
index 0000000..45f4e21
--- /dev/null
+++ b/debian/patches/0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch
@@ -0,0 +1,39 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Wed, 8 Jul 2015 11:38:02 +0300
+Subject: Look for templates in /usr/share/test-kitchen/templates/
+
+---
+ lib/kitchen/generator/driver_create.rb | 4 +++-
+ lib/kitchen/generator/init.rb          | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/kitchen/generator/driver_create.rb b/lib/kitchen/generator/driver_create.rb
+index 6e2a3f8..919ab8e 100644
+--- a/lib/kitchen/generator/driver_create.rb
++++ b/lib/kitchen/generator/driver_create.rb
+@@ -39,7 +39,9 @@ module Kitchen
+ 
+       # Invoke the command.
+       def create
+-        self.class.source_root(Kitchen.source_root.join("templates", "driver"))
++        self.class.source_root(File.join(
++          File.dirname(__FILE__),
++          "../../../../../share/test-kitchen/templates/driver"))
+ 
+         create_core_files
+         create_source_files
+diff --git a/lib/kitchen/generator/init.rb b/lib/kitchen/generator/init.rb
+index 67f021d..fa69cbf 100644
+--- a/lib/kitchen/generator/init.rb
++++ b/lib/kitchen/generator/init.rb
+@@ -58,7 +58,9 @@ module Kitchen
+ 
+       # Invoke the command.
+       def init
+-        self.class.source_root(Kitchen.source_root.join("templates", "init"))
++        self.class.source_root(File.join(
++          File.dirname(__FILE__),
++          "../../../../../share/test-kitchen/templates/init"))
+ 
+         create_kitchen_yaml
+         create_chefignore
diff --git a/debian/patches/series b/debian/patches/series
index af7c12e..8cf1392 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
 0006-Search-for-support-in-usr-share-test-kitchen.patch
 0007-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch
+0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch

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