[vim] 01/02: helpztags: Return to $startdir after open() failure

[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 d975e0e85d85fa51597209790b3e8adb50eb792e
Author: James McCoy <jamessan at debian.org>
Date:   Sat Apr 2 14:40:29 2016 -0400

    helpztags: Return to $startdir after open() failure
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/helpztags | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/helpztags b/debian/helpztags
index a0e4000..83291cc 100644
--- a/debian/helpztags
+++ b/debian/helpztags
@@ -60,7 +60,11 @@ foreach my $dir (@ARGV) {
     if ($1) {
       $suffix = "-$1";
     }
-    do { open(GZ, "zcat $file|") if ($file =~ /\.gz$/) } or open(GZ,$file) or next;
+    my $open = do { open(GZ, "zcat $file|") if ($file =~ /\.gz$/) } or open(GZ,$file);
+    if (!$open) {
+      chdir $startdir;
+      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