[DRE-commits] [ruby-simplecov] 01/02: avoid modifying the $LOAD_PATH

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-simplecov.

commit ea40636d4c286a67c0f3a1cb03e5e0a138250b79
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Oct 22 17:12:01 2015 -0200

    avoid modifying the $LOAD_PATH
    
    This fixes using simplecov against a local repository of a project that is also
    installed as a Debian package.
---
 debian/changelog                                  |  9 +++++++++
 debian/patches/dont-mess-with-the-load-path.patch | 10 ++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 11777d4..f038f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-simplecov (0.10.0-2) UNRELEASED; urgency=medium
+
+  * Team upload
+  * debian/patches/dont-mess-with-the-load-path.patch: avoid modifying the
+    $LOAD_PATH. This fixes using simplecov against a local repository of a
+    project that is also installed as a Debian package.
+
+ -- Antonio Terceiro <terceiro at debian.org>  Thu, 22 Oct 2015 17:10:45 -0200
+
 ruby-simplecov (0.10.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/dont-mess-with-the-load-path.patch b/debian/patches/dont-mess-with-the-load-path.patch
new file mode 100644
index 0000000..6b014f3
--- /dev/null
+++ b/debian/patches/dont-mess-with-the-load-path.patch
@@ -0,0 +1,10 @@
+--- a/lib/simplecov.rb
++++ b/lib/simplecov.rb
+@@ -131,7 +131,6 @@ module SimpleCov
+   end
+ end
+ 
+-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
+ require "simplecov/configuration"
+ SimpleCov.send :extend, SimpleCov::Configuration
+ require "simplecov/exit_codes"
diff --git a/debian/patches/series b/debian/patches/series
index 62ab1d4..6278f23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-rubygems-bundler.patch
 ignore-simplecov-html
 skip-broken-test.patch
 fix-test-suite.patch
+dont-mess-with-the-load-path.patch

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