[SCM] vim-addon-manager packaging branch, master, updated. v0.4.3-2-g1fad9b7

James Vega jamessan at debian.org
Thu Sep 15 00:33:53 UTC 2011


The following commit has been merged in the master branch:
commit 1ac3210c335aba5b8710bb5e4b6a27fc7737068c
Author: James Vega <jamessan at debian.org>
Date:   Sun Sep 11 10:40:33 2011 -0400

    Check dirs.size > 0 to avoid an infinite loop when taraget dir is a symlink
    
    Closes: #634379
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 507ebd2..a9319cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vim-addon-manager (0.4.4) UNRELEASED; urgency=low
+
+  * Correct a check when removing an addon to avoid getting into a loop when
+    the target directory is a symlink.  (Closes: #634379)
+
+ -- James Vega <jamessan at debian.org>  Sun, 11 Sep 2011 10:38:22 -0400
+
 vim-addon-manager (0.4.3) unstable; urgency=low
 
   * Don't try to remove “/path/to/addons/.”.  (Closes: #566186)
diff --git a/src/vim/addon-manager.rb b/src/vim/addon-manager.rb
index 764ec86..b89a1c7 100644
--- a/src/vim/addon-manager.rb
+++ b/src/vim/addon-manager.rb
@@ -63,7 +63,7 @@ module Vim
 	File.delete(File.join(@target_dir, file))
 	dir = File.dirname(file)
 	paths = (dir.include? File::Separator) ? File.split(dir) : [dir]
-	while paths.size
+	while paths.size > 0
 	  begin
 	    FileUtils.rmdir(File.join(@target_dir, paths))
 	  rescue Errno::ENOTEMPTY

-- 
vim-addon-manager packaging



More information about the pkg-vim-maintainers mailing list