[vim] 01/02: helpztags: Simplify file opening to fix "is open" check

[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 27505788959a56c12a08920ab49c6d46632b05a6
Author: James McCoy <jamessan at debian.org>
Date:   Thu Apr 7 22:34:28 2016 -0400

    helpztags: Simplify file opening to fix "is open" check
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 7 +++++++
 debian/helpztags | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 117b314..719f11b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vim (2:7.4.1689-3) UNRELEASED; urgency=medium
+
+  * helpztags: Fix regression in previous upload where the doc file isn't
+    opened, so no tags file is generated.  (Closes: #820313)
+
+ -- James McCoy <jamessan at debian.org>  Thu, 07 Apr 2016 22:25:40 -0400
+
 vim (2:7.4.1689-2) unstable; urgency=medium
 
   * Stop installing a dangling symlink at
diff --git a/debian/helpztags b/debian/helpztags
old mode 100644
new mode 100755
index d5c2837..425d37e
--- a/debian/helpztags
+++ b/debian/helpztags
@@ -60,7 +60,7 @@ foreach my $dir (@ARGV) {
     if ($1) {
       $suffix = "-$1";
     }
-    my $open = do { open(GZ, "zcat $file|") if ($file =~ /\.gz$/) } or open(GZ,$file);
+    my $open = ($file =~ /\.gz$/) ? open(GZ, '-|', 'zcat', $file) : open(GZ, $file);
     if (!$open) {
       chdir $startdir;
       next;

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