[DRE-commits] [SCM] syncache.git branch, master, updated. upstream/1.0-3-gf1559ae

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit f1559aeaeb46016bc2bdf651c37288de6430822b
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Wed Sep 14 14:27:29 2011 +0300

    patch: apply sync.rb monkey patch on ruby above 1.9.0, too

diff --git a/debian/patches/0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch b/debian/patches/0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch
new file mode 100644
index 0000000..5ce4b3f
--- /dev/null
+++ b/debian/patches/0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch
@@ -0,0 +1,35 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Wed, 14 Sep 2011 14:15:04 +0300
+Subject: apply sync.rb monkey patch on ruby above 1.9.0, too
+
+The same bug is still there in Ruby 1.9.2p290, and the monkey patch has
+to be more agressive to really stick.
+---
+ lib/syncache_sync_patch.rb |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/lib/syncache_sync_patch.rb b/lib/syncache_sync_patch.rb
+index df9d9b1..29524d5 100644
+--- a/lib/syncache_sync_patch.rb
++++ b/lib/syncache_sync_patch.rb
+@@ -20,7 +20,7 @@ module Sync_m
+   end
+ end
+ 
+-elsif RUBY_VERSION == "1.9.0"
++elsif RUBY_VERSION >= "1.9.0"
+ 
+ module Sync_m
+   def sync_try_lock(mode = EX)
+@@ -33,4 +33,10 @@ module Sync_m
+   end
+ end
+ 
++class Sync_c
++  include Sync_m
++end
++
++Synchronizer = Sync = Sync_c
++
+ end
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3036e1f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch

-- 
syncache.git