[DRE-commits] [SCM] rubygems.git branch, master, updated. debian/1.8.24-1

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit df22bddcdc25bce0bee6766423442ca6793cf189
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sat Jun 9 22:25:05 2012 +0900

    * Added a patch: debian/patches/20120608-fix-assert_match.diff
      - Fixed the incorrect use of assert_match.

diff --git a/debian/changelog b/debian/changelog
index f51fa9e..0b75bae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ rubygems (1.8.24-1) unstable; urgency=low
     - Bumped up Standards-Version to 3.9.3.
   * Added a patch: debian/patches/20120608-fix-test_gem_platform.rb.diff
     - Imported from the upstream 4a85e2ac70579c32031766338505e85b2c392b27.
+  * Added a patch: debian/patches/20120608-fix-assert_match.diff
+    - Fixed the incorrect use of assert_match.
 
  -- Daigo Moriwaki <daigo at debian.org>  Sat, 09 Jun 2012 18:22:42 +0900
 
diff --git a/debian/patches/20120608-fix-assert_match.diff b/debian/patches/20120608-fix-assert_match.diff
new file mode 100644
index 0000000..e71ce3c
--- /dev/null
+++ b/debian/patches/20120608-fix-assert_match.diff
@@ -0,0 +1,13 @@
+Index: rubygems/test/rubygems/test_gem_installer.rb
+===================================================================
+--- rubygems.orig/test/rubygems/test_gem_installer.rb	2012-06-09 22:22:15.000000000 +0900
++++ rubygems/test/rubygems/test_gem_installer.rb	2012-06-09 22:23:27.000000000 +0900
+@@ -1217,7 +1217,7 @@
+   def test_dir
+     util_setup_install
+ 
+-    assert_match @installer.dir, %r!/installer/gems/a-2$!
++    assert_match %r!/installer/gems/a-2$!, @installer.dir
+   end
+ 
+   def old_ruby_required
diff --git a/debian/patches/series b/debian/patches/series
index 38999c3..5510073 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ disable-failing-tests.diff
 disable-tests-failing-as-root.diff
 fix-shebang.diff
 20120608-fix-test_gem_platform.rb.diff
+20120608-fix-assert_match.diff

-- 
rubygems.git