Bug#770113: unblock: mikutter/3.0.8+dfsg-1

[NOKUBI Takatsugu]

Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package mikutter

I uploaded 3.0.9+dfsg-1~bpo70-1. It is not installed jessie.
The different about 3.0.8 to 3.0.9 is bug fix only.

unblock mikutter/3.0.8+dfsg-1

diff --git a/core/config.rb b/core/config.rb
index 0e0ea49..98a358f 100644
--- a/core/config.rb
+++ b/core/config.rb
@@ -50,6 +50,6 @@ module CHIConfig
   REVISION = 9999
 
   # $B$3$N%=%U%H$N%P!<%8%g%s!#(B
-  VERSION = [3,0,8, REVISION]
+  VERSION = [3,0,9, REVISION]
 
 end
diff --git a/core/retriever.rb b/core/retriever.rb
index e4f1f77..a4c3f77 100644
--- a/core/retriever.rb
+++ b/core/retriever.rb
@@ -15,7 +15,9 @@ module Retriever
   class Model
     include Comparable
 
-    @@storage = WeakStorage.new(Integer, Model) # id => <Model>
+    def self.inherited(subclass)
+      subclass.instance_eval do
+        @storage = WeakStorage.new(Integer, subclass) end end
 
     def initialize(args)
       type_strict args => Hash
@@ -30,7 +32,7 @@ module Retriever
     def self.generate(args, count=-1)
       return args if args.is_a?(self)
       return self.findbyid(args, count) if not(args.is_a? Hash)
-      sresult = self.findbyid(args[:id], count)
+      result = self.findbyid(args[:id], count)
       return result.merge(args) if result
       self.new(args)
     end
@@ -48,7 +50,7 @@ module Retriever
           hash
         elsif hash[:id] and hash[:id] != 0
           atomic{
-            @@storage[hash[:id].to_i] or self.new(hash) }
+            @storage[hash[:id].to_i] or self.new(hash) }
         else
           raise ArgumentError.new("incorrect type #{hash.class} 
#{hash.inspect}") end end end
 
@@ -248,7 +250,7 @@ module Retriever
     # $BJ]B8$O!"A4$F$N%G!<%?%=!<%9$KBP$7$F9T$o$l$^$9(B
     def self.store_datum(datum)
       atomic{
-        @@storage[datum[:id].to_i] = result_strict(self){ datum } }
+        @storage[datum[:id].to_i] = result_strict(self){ datum } }
       return datum if datum[:system]
       converted = datum.filtering
       self.retrievers.each{ |retriever|
@@ -287,14 +289,10 @@ module Retriever
     def self.memory_class
       Memory end
 
-    # $B%a%b%j%-%c%C%7%e%*%V%8%'%/%H$N%$%s%9%?%s%9(B
-    def self.memory
-      @memory ||= memory_class.new(@@storage) end
-
     # DataSource$B$NG[Ns$rJV$7$^$9!#(B
     def self.retrievers
       atomic{
-        @retrievers = [memory] if not defined? @retrievers }
+        @retrievers = [memory_class.new(@storage)] if not defined? @retrievers 
}
       @retrievers
     end
 
diff --git a/debian/changelog b/debian/changelog
index 7f2bd09..bf1e9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mikutter (3.0.9+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- HIGUCHI Daisuke (VDR dai) <d...@debian.org>  Sat, 08 Nov 2014 18:26:12 
+0900
+
 mikutter (3.0.8+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org