[vim] 01/02: helpztags: Don't try to read a file if it can't be opened

[James McCoy]

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

jamessan pushed a commit to branch debian/sid
in repository vim.

commit e86adcb675d182f85b00dc8f1c7603765de913be
Author: James McCoy <jamessan at debian.org>
Date:   Sat Apr 2 10:18:31 2016 -0400

    helpztags: Don't try to read a file if it can't be opened
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 4 +++-
 debian/helpztags | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20bfc48..e02a2fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 vim (2:7.4.1689-2) UNRELEASED; urgency=medium
 
   * Stop installing a dangling symlink at
-    /usr/share/vim/addons/doc/matchit.txt.  (Closes: #819764)
+    /usr/share/vim/addons/doc/matchit.txt.  (Closes: #819796)
   * Lintian:
     + Provide more details in vim-doc's long description.  Thanks to Elimar
       Riesebieter for the patch.  (Closes: #819733)
+  * helpztags: Don't try to read a file if it can't be opened.  (Closes:
+    #819764)
 
  -- James McCoy <jamessan at debian.org>  Fri, 01 Apr 2016 20:43:40 -0400
 
diff --git a/debian/helpztags b/debian/helpztags
index 82d6b62..a0e4000 100644
--- a/debian/helpztags
+++ b/debian/helpztags
@@ -60,7 +60,7 @@ foreach my $dir (@ARGV) {
     if ($1) {
       $suffix = "-$1";
     }
-    do { open(GZ, "zcat $file|") if ($file =~ /\.gz$/) } or open(GZ,$file);
+    do { open(GZ, "zcat $file|") if ($file =~ /\.gz$/) } or open(GZ,$file) or next;
     while (<GZ>) {
         # From vim73/src/ex_cmds.c, helptags_one, lines 6443-6445
         # 

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