[SCM] vim-addon-manager packaging branch, master, updated. debian/0.5.0-1-gb311675

[James McCoy]

The following commit has been merged in the master branch:
commit b311675b4307686d465867721cce4a6a31bdcfc1
Author: James McCoy <jamessan at debian.org>
Date:   Tue Jul 17 19:20:50 2012 -0400

    Fix calls to override_file and logger.info.
    
    Closes: #681870
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index cd22508..1591e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vim-addon-manager (0.5.1) UNRELEASED; urgency=low
+
+  * Fix calls to override_file and logger.info.  (Closes: #681870)
+
+ -- James McCoy <jamessan at debian.org>  Tue, 17 Jul 2012 19:20:02 -0400
+
 vim-addon-manager (0.5.0) unstable; urgency=low
 
   * Addons now can now use a new layout: instead of having its files symlinked
diff --git a/lib/vim/addon_manager.rb b/lib/vim/addon_manager.rb
index 0508ac9..7760dfa 100644
--- a/lib/vim/addon_manager.rb
+++ b/lib/vim/addon_manager.rb
@@ -96,7 +96,7 @@ module Vim
             logger.info "enabling disabled addon '#{addon}'"
             lines.reject! {|line| addon.is_disabled_by? line}
           else
-            logger "ignoring addon '#{addon}' which is enabled"
+            logger.info "ignoring addon '#{addon}' which is enabled"
           end
         end
       end
@@ -122,7 +122,7 @@ module Vim
 
     def map_override_lines
       override_lines = []
-      override_file = logger.override_file @target_dir
+      override_file = Vim::AddonManager.override_file @target_dir
       if File.exist? override_file
         File.open(override_file) do |file|
           override_lines += file.to_a

-- 
vim-addon-manager packaging