[vim-addon-manager] 02/03: Fallback to using getent if $HOME isn't set.

James McCoy jamessan at debian.org
Tue Dec 3 05:50:59 UTC 2013


This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository vim-addon-manager.

commit 385866630bf3ed5f462d7aadf5771deede19ef04
Author: James McCoy <jamessan at debian.org>
Date:   Mon Dec 2 23:38:42 2013 -0500

    Fallback to using getent if $HOME isn't set.
    
    Closes: #726329
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 bin/vim-addon-manager | 3 ++-
 debian/changelog      | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/vim-addon-manager b/bin/vim-addon-manager
index d7c0917..278000a 100755
--- a/bin/vim-addon-manager
+++ b/bin/vim-addon-manager
@@ -155,6 +155,7 @@ option) any later version.
 
 =end
 
+require 'etc'
 require 'getoptlong'
 
 require 'vim/addon_manager'
@@ -198,7 +199,7 @@ def parse_cmdline
     :registry_dir => '/usr/share/vim/registry',
     :source_dir   => '/usr/share/vim/addons',
     :system_dir   => '/var/lib/vim/addons',
-    :target_dir   => File.join(ENV['HOME'], '.vim'),
+    :target_dir   => File.join(ENV['HOME'] || (Etc.getpwnam Etc.getlogin).dir, '.vim'),
     :query        => false,
     :system_wide  => false,
   }
diff --git a/debian/changelog b/debian/changelog
index ec14ad7..3f32241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ vim-addon-manager (0.5.3) UNRELEASED; urgency=low
 
   * Use a standard directory mode when installing an addon as root.  (Closes:
     #680624)
+  * Fallback to using getent if $HOME isn't set.  Thanks to Helmut Grohne for
+    the patch.  (Closes: #726329)
 
  -- James McCoy <jamessan at debian.org>  Mon, 02 Dec 2013 21:58:14 -0500
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim-addon-manager.git



More information about the pkg-vim-maintainers mailing list