[DRE-commits] [SCM] ruby-tzinfo.git branch, master, updated. upstream/0.3.31-7-g30cb944

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 30cb94494d31bd7df517080d0f0a09faf2e456d6
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sat Feb 18 21:29:53 2012 +0300

    disable test_get_tainted_not_loaded

diff --git a/debian/patches/0001-disable-tainted-load-test.patch b/debian/patches/0001-disable-tainted-load-test.patch
new file mode 100644
index 0000000..15cd8df
--- /dev/null
+++ b/debian/patches/0001-disable-tainted-load-test.patch
@@ -0,0 +1,22 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Sat, 18 Feb 2012 21:27:41 +0300
+Subject: disable tainted load test
+
+This test won't work when building the package under /tmp.
+---
+ test/tc_timezone.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test/tc_timezone.rb b/test/tc_timezone.rb
+index f49a4d8..4f99fbc 100644
+--- a/test/tc_timezone.rb
++++ b/test/tc_timezone.rb
+@@ -151,7 +151,7 @@ class TCTimezone < Test::Unit::TestCase
+   # Disable test in Ruby 1.9. See:
+   # http://groups.google.com/group/ruby-talk-google/browse_thread/thread/170a7205555cedfc
+   # It doesn't appear to be possible to require a file from the load path in Ruby 1.9.
+-  if RUBY_VERSION !~ /^1.9/
++  if RUBY_VERSION !~ /^1.9/ and false
+     def test_get_tainted_not_loaded
+       safe_test do
+         tz = Timezone.get('Europe/Amsterdam'.taint)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..50ee78d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-disable-tainted-load-test.patch

-- 
ruby-tzinfo.git