[debhelper-devel] [debhelper] 01/01: dh_makeshlibs: Fix uninitialise warning on error

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 4d3015556a184afd533ac6d71ec306af3e9a7b6f
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jul 21 18:18:35 2015 +0200

    dh_makeshlibs: Fix uninitialise warning on error
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_makeshlibs    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 19d8854..6517ae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ debhelper (9.20150629) UNRELEASED; urgency=medium
     set to 1) in DEB_BUILD_OPTIONS.
   * dh_strip: Apply patch from Guillem Jover to fix a typo.
     (Closes: #792207)
+  * dh_makeshlibs: Avoid an uninitialise warning in some
+    error cases.  Thanks to Jakub Wilk for reporting it.
+    (Closes: #793092)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 28 Jun 2015 15:08:19 +0200
 
diff --git a/dh_makeshlibs b/dh_makeshlibs
index e567f8e..d14da55 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -268,7 +268,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			"-p$package", "-I$symbols", "-P$tmp",
 			@liblist,
 			@{$dh{U_PARAMS}});
-		if (-s "$tmp/DEBIAN/symbols" == 0) {
+		if (-f "$tmp/DEBIAN/symbols" and -s _ == 0) {
 			doit("rm", "-f", "$tmp/DEBIAN/symbols");
 		}
 	}

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