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

James Vega jamessan at debian.org
Fri Jan 22 04:59:16 UTC 2010


The following commit has been merged in the master branch:
commit 90f154be176598fa69b3bc52e069f0b0885a9262
Author: James Vega <jamessan at debian.org>
Date:   Thu Jan 21 23:51:32 2010 -0500

    Don't try to remove “/path/to/addons/.”.
    
    The trailing `.' in the path causes FileUtils.rmdir to error out.
    
    Closes: #566186
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index f6eba56..c5c7313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vim-addon-manager (0.4.3) UNRELEASED; urgency=low
+
+  * Don't try to remove “/path/to/addons/.”.  (Closes: #566186)
+
+ -- James Vega <jamessan at debian.org>  Thu, 21 Jan 2010 23:49:47 -0500
+
 vim-addon-manager (0.4.2) unstable; urgency=low
 
   * debian/control:
diff --git a/src/vim/addon-manager.rb b/src/vim/addon-manager.rb
index 1afe833..054532d 100644
--- a/src/vim/addon-manager.rb
+++ b/src/vim/addon-manager.rb
@@ -61,7 +61,8 @@ module Vim
       removed_files = []
       rmdirs = lambda do |file|
 	File.delete(File.join(@target_dir, file))
-	paths = File.split(File.dirname(file))
+	dir = File.dirname(file)
+	paths = (dir.include? File::Separator) ? File.split(dir) : [dir]
 	while paths.size
 	  begin
 	    FileUtils.rmdir(File.join(@target_dir, paths))

-- 
vim-addon-manager packaging



More information about the pkg-vim-maintainers mailing list