From: Guillem Jover <guillem@debian.org>
Date: Sun, 11 Feb 2007 23:20:37 +0000 (+0000)
Subject: 	* scripts/dpkg-shlibdeps.pl: Move syserr:s to be or'ed after exec:s.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9842af3466cb545494f86051c2eb6adfd71b1ceb;p=dpkg

	* scripts/dpkg-shlibdeps.pl: Move syserr:s to be or'ed after exec:s.
---

diff --git a/ChangeLog b/ChangeLog
index 35cbb46c..fc3f127e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-12  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-shlibdeps.pl: Move syserr:s to be or'ed after exec:s.
+
 2007-02-12  Guillem Jover  <guillem@debian.org>
 
 	* scripts/controllib.pl (outputclose): Change argument from a boolean
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index d22db19c..04a3c709 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -173,8 +173,8 @@ for ($i=0;$i<=$#exec;$i++) {
     # Now we get the direct deps of the program
     defined(my $c= open(P,"-|")) || syserr(_g("cannot fork for objdump"));
     if (!$c) {
-	exec("objdump","-p","--",$exec[$i]);
-	syserr(_g("cannot exec objdump"));
+	exec("objdump", "-p", "--", $exec[$i]) or
+	    syserr(_g("cannot exec objdump"));
     }
     while (<P>) {
 	chomp;
@@ -266,8 +266,8 @@ if ($#libfiles >= 0) {
 	close STDERR; # we don't need to see dpkg's errors
 	open STDERR, "> /dev/null";
 	$ENV{LC_ALL} = "C";
-	exec("dpkg","--search","--",@libfiles);
-	syserr(_g("cannot exec dpkg"));
+	exec("dpkg", "--search", "--", @libfiles) or
+	    syserr(_g("cannot exec dpkg"));
     }
     while (<P>) {
 	chomp;
@@ -331,8 +331,8 @@ sub get_format {
     } else {
 	defined(my $c= open(P,"-|")) || syserr(_g("cannot fork for objdump"));
 	if (!$c) {
-	    exec("objdump","-a","--",$file);
-	    syserr(_g("cannot exec objdump"));
+	    exec("objdump", "-a", "--", $file) or
+		syserr(_g("cannot exec objdump"));
 	}
 	while (<P>) {
 	    chomp;