[DRE-commits] [schleuder] 05/06: debian/patches/0003-bin-fix-require.patch: Refresh for 3.1.2-1

[Georg Faerber]

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

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit 2cf34e52841eb12f3383a27f658d4576e7a3c6a9
Author: Georg Faerber <georg at riseup.net>
Date:   Mon Jul 17 20:59:03 2017 +0200

    debian/patches/0003-bin-fix-require.patch: Refresh for 3.1.2-1
---
 debian/patches/0003-bin-fix-require.patch | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0003-bin-fix-require.patch b/debian/patches/0003-bin-fix-require.patch
index 37007c3..1236b24 100644
--- a/debian/patches/0003-bin-fix-require.patch
+++ b/debian/patches/0003-bin-fix-require.patch
@@ -1,22 +1,31 @@
-Description: bin/: Use 'require' instead of 'require_relative'
+Description: bin/: Use 'require' or 'require_relative'
  As we're installing into '/usr/lib/ruby/vendor_ruby',
  'require_relative' as used by upstream doesn't work.
+
+ A test which was added in the last upstream release made this change no
+ longer work, thus we're catching a possible 'LoadError' now and require
+ the file via a relative path.
+
  Upstream is aware of this patch and we're working on integrating it.
 Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-01-26
+Last-Update: 2017-07-17
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/bin/schleuder
 +++ b/bin/schleuder
-@@ -8,7 +8,7 @@
- 
+@@ -9,8 +9,11 @@
  
  begin
--  require_relative '../lib/schleuder/cli'
+   require_relative '../lib/schleuder/cli'
+-  Schleuder::Cli.start
++rescue LoadError
 +  require 'schleuder/cli'
-   Schleuder::Cli.start
  rescue => exc
    $stderr.puts "Technical Error: #{exc}\n#{exc.backtrace.first}"
+   exit 1
+ end
++
++Schleuder::Cli.start
 --- a/bin/schleuder-api-daemon
 +++ b/bin/schleuder-api-daemon
 @@ -7,7 +7,7 @@

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