[SCM] vim-addon-manager packaging branch, master, updated. v0.4.2-3-g2f517bd

[James Vega]

The following commit has been merged in the master branch:
commit 009f9b299563479c8c9882385d00d91ecc9e17c7
Author: James Vega <jamessan at debian.org>
Date:   Thu Jan 21 23:54:34 2010 -0500

    Prevent generation of helptags when no documentation exists.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index c5c7313..74691be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 vim-addon-manager (0.4.3) UNRELEASED; urgency=low
 
   * Don't try to remove “/path/to/addons/.”.  (Closes: #566186)
+  * Do not regenerate the helptags after removing the last
+    documentation-providing addon.  Simply remove the docs directory instead.
 
  -- James Vega <jamessan at debian.org>  Thu, 21 Jan 2010 23:49:47 -0500
 
diff --git a/src/vim/addon-manager.rb b/src/vim/addon-manager.rb
index 054532d..764ec86 100644
--- a/src/vim/addon-manager.rb
+++ b/src/vim/addon-manager.rb
@@ -88,7 +88,16 @@ module Vim
 	  Vim.info "ignoring '#{addon}' which is neither installed nor broken"
 	end
       end
-      rebuild_tags(removed_files)
+      # Try to clean up the tags file and doc dir if it's empty
+      tagfile = File.join(@target_dir, 'doc', 'tags')
+      if File.exists? tagfile
+	File.unlink tagfile
+	begin
+	  FileUtils.rmdir File.join(@target_dir, 'doc')
+	rescue Errno::ENOTEMPTY
+	  rebuild_tags(removed_files)
+	end
+      end
     end
 
     def disable(addons)

-- 
vim-addon-manager packaging