[DRE-commits] [ruby-retryable] 07/08: Refresh patches

Hleb Valoshka tsfgnu-guest at moszumanska.debian.org
Fri Aug 5 16:02:22 UTC 2016


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

tsfgnu-guest pushed a commit to branch master
in repository ruby-retryable.

commit 6c35af095ba1dfb3f43d1c2df26ba406199c57d0
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Fri Aug 5 18:59:09 2016 +0300

    Refresh patches
---
 ...ire-retryable-with-absolute-path-and-don-t.patch | 21 +++++++++++++++++++++
 ...Don-t-require-retryable-with-absolute-path.patch | 19 -------------------
 debian/patches/series                               |  2 +-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/debian/patches/0001-Don-t-require-retryable-with-absolute-path-and-don-t.patch b/debian/patches/0001-Don-t-require-retryable-with-absolute-path-and-don-t.patch
new file mode 100644
index 0000000..8edf606
--- /dev/null
+++ b/debian/patches/0001-Don-t-require-retryable-with-absolute-path-and-don-t.patch
@@ -0,0 +1,21 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Fri, 5 Aug 2016 18:58:55 +0300
+Subject: Don't require retryable with absolute path and don't require pry
+
+ It should fix test failure on deb-ci.
+---
+ spec/spec_helper.rb | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 6d948f8..f6b56b9 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,6 +1,5 @@
+-require File.dirname(__FILE__) + '/../lib/retryable'
++require 'retryable'
+ require 'rspec'
+-require 'pry'
+ 
+ RSpec.configure do |config|
+   config.disable_monkey_patching!
diff --git a/debian/patches/0001-Don-t-require-retryable-with-absolute-path.patch b/debian/patches/0001-Don-t-require-retryable-with-absolute-path.patch
deleted file mode 100644
index c78893d..0000000
--- a/debian/patches/0001-Don-t-require-retryable-with-absolute-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Hleb <375gnu at gmail.com>
-Date: Mon, 27 Jul 2015 12:08:35 +0300
-Subject: Don't require retryable with absolute path
-
- It should fix test failure on deb-ci.
----
- spec/spec_helper.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index ce71960..f6b56b9 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,4 +1,4 @@
--require File.dirname(__FILE__) + '/../lib/retryable'
-+require 'retryable'
- require 'rspec'
- 
- RSpec.configure do |config|
diff --git a/debian/patches/series b/debian/patches/series
index 1f91392..610ed6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Don-t-require-retryable-with-absolute-path.patch
+0001-Don-t-require-retryable-with-absolute-path-and-don-t.patch

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



More information about the Pkg-ruby-extras-commits mailing list