[DRE-commits] [ruby-solve] 01/01: Add patch for Molinillo 0.4

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-solve.

commit 14d7db33f53af1c891b076c5fba61546c46b2869
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Mar 3 19:12:29 2016 +0100

    Add patch for Molinillo 0.4
---
 ...02-Add-callback-required-by-Molinillo-0.4.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch b/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch
new file mode 100644
index 0000000..af3326c
--- /dev/null
+++ b/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch
@@ -0,0 +1,31 @@
+From f59ae43c62a30ba7b4bc6131bf3cfa638978ea75 Mon Sep 17 00:00:00 2001
+From: Christian Hofstaedtler <zeha at debian.org>
+Date: Thu, 3 Mar 2016 19:10:48 +0100
+Subject: [PATCH] Add callback required by Molinillo 0.4
+
+allow_missing? is a new callback expected by molinillo. We'll just
+return false all the time, as that's the previous behaviour.
+---
+ lib/solve/ruby_solver.rb | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/solve/ruby_solver.rb b/lib/solve/ruby_solver.rb
+index 4bf244e..1882c51 100644
+--- a/lib/solve/ruby_solver.rb
++++ b/lib/solve/ruby_solver.rb
+@@ -109,6 +109,12 @@ module Solve
+       @ui.say('Starting dependency resolution') if @ui
+     end
+ 
++    # Callback required by Molinillo, asks solver if a given dep can be ignored.
++    # @return false
++    def allow_missing?(dependency)
++      false
++    end
++
+     # Callback required by Molinillo, called when the solve is complete.
+     # @return nil
+     def after_resolution
+-- 
+2.7.0
+
diff --git a/debian/patches/series b/debian/patches/series
index d043332..9be9311 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Do-not-require-bundler.patch
+0002-Add-callback-required-by-Molinillo-0.4.patch

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