[DRE-commits] [gem2deb] 01/01: gem2deb-test-runner: put directories under debian/ first in GEM_PATH

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository gem2deb.

commit 84ad9ba6ddaf67fcda4f82e9e65fd8352895fd11
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jan 28 10:18:36 2016 -0200

    gem2deb-test-runner: put directories under debian/ first in GEM_PATH
---
 debian/changelog           | 10 ++++++++++
 lib/gem2deb/test_runner.rb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2652201..bc32177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gem2deb (0.25.2) UNRELEASED; urgency=medium
+
+  * gem2deb-test-runner: put directories under debian/ first in GEM_PATH to
+    make sure dependency resolution uses the metadata installed during the
+    build with precedence over metadata already installed in the system. Fixes
+    building packages on non-clean systems where the package you are building
+    may have a version already installed.
+
+ -- Antonio Terceiro <terceiro at debian.org>  Thu, 28 Jan 2016 10:17:02 -0200
+
 gem2deb (0.25.1) unstable; urgency=medium
 
   * gem2deb, gem2deb-test-runner: add dependency on rake since we now call
diff --git a/lib/gem2deb/test_runner.rb b/lib/gem2deb/test_runner.rb
index 9bcafd0..d44c93c 100644
--- a/lib/gem2deb/test_runner.rb
+++ b/lib/gem2deb/test_runner.rb
@@ -57,7 +57,7 @@ module Gem2Deb
       if self.autopkgtest
         nil
       else
-        (Gem.path + Dir.glob("debian/*/usr/**/rubygems-integration/{all,#{ruby_api_version}}")).join(':')
+        (Dir.glob("debian/*/usr/**/rubygems-integration/{all,#{ruby_api_version}}") + Gem.path).join(':')
       end
     end
 

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