[paludis-commits] r4570 - scratch/scripts

[dleverton at svn.pioto.org]

Author: dleverton
Date: 2008-04-16 15:03:11 +0000 (Wed, 16 Apr 2008)
New Revision: 4570

Modified:
   scratch/scripts/config-decruft
   scratch/scripts/grex.rb
Log:
Update config-decruft and grex for new Log.message

Modified: scratch/scripts/config-decruft
===================================================================
--- scratch/scripts/config-decruft	2008-04-16 14:01:13 UTC (rev 4569)
+++ scratch/scripts/config-decruft	2008-04-16 15:03:11 UTC (rev 4570)
@@ -93,6 +93,15 @@
 
 ################ evil trickery ################
 
+if Paludis::Log.instance.method(:message).arity == 2 then
+    class Paludis::Log
+        alias real_message message
+        def message(id, level, msg)
+            real_message(level, msg)
+        end
+    end
+end
+
 class FakeSourceOriginKey
     def initialize(value)
         @value = value
@@ -111,7 +120,7 @@
         return FakeSourceOriginKey.new("virtuals") unless virtual_for_key.nil?
 
         Paludis::Log.instance.
-            message(Paludis::LogLevel::Warning,
+            message("config-decruft.unknown_origin", Paludis::LogLevel::Warning,
                     "Unable to determine origin repository for #{self}, assuming #{$db.favourite_repository}") unless @@faked_source_origins[self]
         @@faked_source_origins[self] = true
         FakeSourceOriginKey.new($db.favourite_repository)
@@ -365,7 +374,7 @@
                 if !missing_origins.has_key?(pkg) &&
                         !pkg.iuse_key.nil? then
                     Paludis::Log.instance.
-                        message(Paludis::LogLevel::Warning,
+                        message("config-decruft.missing_origin", Paludis::LogLevel::Warning,
                                 "Unable to find origin package for #{pkg}, ignoring masks/forces/defaults")
                     missing_origins[pkg] = true
                 end

Modified: scratch/scripts/grex.rb
===================================================================
--- scratch/scripts/grex.rb	2008-04-16 14:01:13 UTC (rev 4569)
+++ scratch/scripts/grex.rb	2008-04-16 15:03:11 UTC (rev 4570)
@@ -21,6 +21,14 @@
 
 include Paludis
 
+if Paludis::Log.instance.method(:message).arity == 2 then
+    class Paludis::Log
+        alias real_message message
+        def message(id, level, msg)
+            real_message(level, msg)
+        end
+    end
+end
 Log.instance.log_level = Paludis::LogLevel::Warning
 Log.instance.program_name = $0
 
@@ -169,7 +177,7 @@
             metadata.elements.each("pkgmetadata/herd") do | element |
                 herd = element.text.to_s
                 if herd.empty?
-                    Paludis::Log.instance.message(Paludis::LogLevel::Qa, "Empty <herd> tag in metadata.xml for #{fqpn} in #{repo.name}.")
+                    Paludis::Log.instance.message("grex.empty_herd", Paludis::LogLevel::Qa, "Empty <herd> tag in metadata.xml for #{fqpn} in #{repo.name}.")
                     next
                 end