summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2013-11-25 21:18:28 +0100
committerGuillem Jover <guillem@debian.org>2013-12-04 06:56:56 +0100
commitee37c9202bb80ea4ee50bf463df1495eaf0d3a7c (patch)
treee6fd1c2c6a0e4e13ecba2804ea909a5c8c7e2eee /scripts
parent0f802f0071e0efd7a260f83c5efc554f0ba585d9 (diff)
downloaddpkg-ee37c9202bb80ea4ee50bf463df1495eaf0d3a7c.tar.gz
perl: Try to avoid boolean operators after predicates on error checks
Using boolean operators after predicates for error checking makes the code flow slightly confusing, do that only after actions, to check if they succeeded and error out otherwise.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Dpkg/Control/HashCore.pm3
-rw-r--r--scripts/Dpkg/Package.pm9
-rw-r--r--scripts/Dpkg/Shlibs/SymbolFile.pm6
-rw-r--r--scripts/Dpkg/Source/Package/V1.pm6
-rw-r--r--scripts/Dpkg/Source/Package/V3/Bzr.pm2
-rw-r--r--scripts/Dpkg/Source/Package/V3/Git.pm10
-rw-r--r--scripts/Dpkg/Source/Patch.pm14
-rw-r--r--scripts/Dpkg/Substvars.pm6
-rw-r--r--scripts/Dpkg/Vars.pm9
-rwxr-xr-xscripts/dpkg-buildpackage.pl12
-rwxr-xr-xscripts/dpkg-distaddfile.pl2
-rwxr-xr-xscripts/dpkg-genchanges.pl54
-rwxr-xr-xscripts/dpkg-gencontrol.pl21
-rwxr-xr-xscripts/dpkg-parsechangelog.pl3
-rwxr-xr-xscripts/dpkg-scanpackages.pl9
-rwxr-xr-xscripts/dpkg-scansources.pl3
-rwxr-xr-xscripts/dpkg-shlibdeps.pl9
17 files changed, 105 insertions, 73 deletions
diff --git a/scripts/Dpkg/Control/HashCore.pm b/scripts/Dpkg/Control/HashCore.pm
index 009eb1012..2cb47d8e1 100644
--- a/scripts/Dpkg/Control/HashCore.pm
+++ b/scripts/Dpkg/Control/HashCore.pm
@@ -224,9 +224,10 @@ sub parse {
if ($expect_pgp_sig) {
# Skip empty lines
$_ = <$fh> while defined($_) && $_ =~ /^\s*$/;
- length($_) ||
+ unless (length $_) {
$self->parse_error($desc, _g('expected PGP signature, ' .
'found EOF after blank line'));
+ }
s/\s*\n$//;
unless (m/^-----BEGIN PGP SIGNATURE-----$/) {
$self->parse_error($desc, _g('expected PGP signature, ' .
diff --git a/scripts/Dpkg/Package.pm b/scripts/Dpkg/Package.pm
index 2a4b439b6..674a7e94f 100644
--- a/scripts/Dpkg/Package.pm
+++ b/scripts/Dpkg/Package.pm
@@ -29,12 +29,15 @@ our @EXPORT = qw(pkg_name_is_illegal);
sub pkg_name_is_illegal($) {
my $name = shift || '';
- $name eq '' &&
+ if ($name eq '') {
return _g('may not be empty string');
- $name =~ m/[^-+.0-9a-z]/o &&
+ }
+ if ($name =~ m/[^-+.0-9a-z]/o) {
return sprintf(_g("character '%s' not allowed"), $&);
- $name =~ m/^[0-9a-z]/o ||
+ }
+ if ($name !~ m/^[0-9a-z]/o) {
return _g('must start with an alphanumeric character');
+ }
return;
}
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index d953c369d..a4fda9b1c 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -385,7 +385,11 @@ sub find_matching_pattern {
# machinery
sub merge_symbols {
my ($self, $object, $minver) = @_;
- my $soname = $object->{SONAME} || error(_g('cannot merge symbols from objects without SONAME'));
+
+ my $soname = $object->{SONAME};
+ error(_g('cannot merge symbols from objects without SONAME'))
+ unless $soname;
+
my %dynsyms;
foreach my $sym ($object->get_exported_dynamic_symbols()) {
my $name = $sym->{name} . '@' .
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index f63d987ef..7bb548c7b 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -81,9 +81,10 @@ sub do_extract {
my $fields = $self->{fields};
$sourcestyle =~ y/X/p/;
- $sourcestyle =~ m/[pun]/ ||
+ unless ($sourcestyle =~ m/[pun]/) {
usageerr(_g('source handling style -s%s not allowed with -x'),
$sourcestyle);
+ }
my $dscdir = $self->{basedir};
@@ -236,10 +237,11 @@ sub do_build {
}
} else {
$sourcestyle =~ y/aA/nn/;
- $sourcestyle =~ m/n/ ||
+ unless ($sourcestyle =~ m/n/) {
error(_g('orig argument is empty (means no orig, no diff) ' .
'but source handling style -s%s wants something'),
$sourcestyle);
+ }
}
} elsif ($sourcestyle =~ m/[aA]/) {
# We have no explicit <orig-dir> or <orig-targz>, try to use
diff --git a/scripts/Dpkg/Source/Package/V3/Bzr.pm b/scripts/Dpkg/Source/Package/V3/Bzr.pm
index 86ca1826d..725ed6ffd 100644
--- a/scripts/Dpkg/Source/Package/V3/Bzr.pm
+++ b/scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -141,7 +141,7 @@ sub do_build {
my $tardir = "$tmp/$dirname";
system('bzr', 'branch', $dir, $tardir);
- $? && subprocerr("bzr branch $dir $tardir");
+ subprocerr("bzr branch $dir $tardir") if $?;
# Remove the working tree.
system('bzr', 'remove-tree', $tardir);
diff --git a/scripts/Dpkg/Source/Package/V3/Git.pm b/scripts/Dpkg/Source/Package/V3/Git.pm
index 3ac6384d4..2ca079556 100644
--- a/scripts/Dpkg/Source/Package/V3/Git.pm
+++ b/scripts/Dpkg/Source/Package/V3/Git.pm
@@ -152,12 +152,12 @@ sub do_build {
$self->{options}{git_depth});
system('git', 'clone', '--depth=' . $self->{options}{git_depth},
'--quiet', '--bare', 'file://' . abs_path($dir), $clone_dir);
- $? && subprocerr('git clone');
+ subprocerr('git clone') if $?;
chdir($clone_dir) ||
syserr(_g("unable to chdir to `%s'"), $clone_dir);
$shallowfile = "$basenamerev.gitshallow";
system('cp', '-f', 'shallow', "$old_cwd/$shallowfile");
- $? && subprocerr('cp shallow');
+ subprocerr('cp shallow') if $?;
}
# Create the git bundle.
@@ -170,7 +170,7 @@ sub do_build {
'HEAD', # ensure HEAD is included no matter what
'--', # avoids ambiguity error when referring to eg, a debian branch
);
- $? && subprocerr('git bundle');
+ subprocerr('git bundle') if $?;
chdir($old_cwd) ||
syserr(_g("unable to chdir to `%s'"), $old_cwd);
@@ -221,14 +221,14 @@ sub do_extract {
# Extract git bundle.
info(_g('cloning %s'), $bundle);
system('git', 'clone', '--quiet', $dscdir . $bundle, $newdirectory);
- $? && subprocerr('git bundle');
+ subprocerr('git bundle') if $?;
if (defined $shallow) {
# Move shallow info file into place, so git does not
# try to follow parents of shallow refs.
info(_g('setting up shallow clone'));
system('cp', '-f', $dscdir . $shallow, "$newdirectory/.git/shallow");
- $? && subprocerr('cp');
+ subprocerr('cp') if $?;
}
sanity_check($newdirectory);
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index 4f61ad10f..a77dd78f5 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -169,18 +169,23 @@ sub add_diff_directory {
$self->_fail_not_same_type("$old/$fn", "$new/$fn");
return;
}
- defined(my $n = readlink("$new/$fn")) ||
+ my $n = readlink("$new/$fn");
+ unless (defined $n) {
syserr(_g('cannot read link %s'), "$new/$fn");
- defined(my $n2 = readlink("$old/$fn")) ||
+ }
+ my $n2 = readlink("$old/$fn");
+ unless (defined $n2) {
syserr(_g('cannot read link %s'), "$old/$fn");
+ }
unless ($n eq $n2) {
$self->_fail_not_same_type("$old/$fn", "$new/$fn");
}
} elsif (-f _) {
my $old_file = "$old/$fn";
if (not lstat("$old/$fn")) {
- $! == ENOENT ||
+ if ($! != ENOENT) {
syserr(_g('cannot stat file %s'), "$old/$fn");
+ }
$old_file = '/dev/null';
} elsif (not -f _) {
$self->_fail_not_same_type("$old/$fn", "$new/$fn");
@@ -202,8 +207,9 @@ sub add_diff_directory {
_g('device or socket is not allowed'));
} elsif (-d _) {
if (not lstat("$old/$fn")) {
- $! == ENOENT ||
+ if ($! != ENOENT) {
syserr(_g('cannot stat file %s'), "$old/$fn");
+ }
} elsif (not -d _) {
$self->_fail_not_same_type("$old/$fn", "$new/$fn");
}
diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 9ea91f90c..8992a2fee 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -173,9 +173,10 @@ sub parse {
while (<$fh>) {
next if m/^\s*\#/ || !m/\S/;
s/\s*\n$//;
- m/^(\w[-:0-9A-Za-z]*)\=(.*)$/ ||
+ if (! m/^(\w[-:0-9A-Za-z]*)\=(.*)$/) {
error(_g('bad line in substvars file %s at line %d'),
$varlistfile, $.);
+ }
$self->{vars}{$1} = $2;
}
}
@@ -244,9 +245,10 @@ sub substvars {
# reset the recursive counter.
$count = 0 if (length($3) < length($rhs));
- $count < $maxsubsts ||
+ if ($count >= $maxsubsts) {
error($opts{msg_prefix} .
_g("too many substitutions - recursive ? - in \`%s'"), $v);
+ }
$lhs = $1; $vn = $2; $rhs = $3;
if (defined($self->{vars}{$vn})) {
$v = $lhs . $self->{vars}{$vn} . $rhs;
diff --git a/scripts/Dpkg/Vars.pm b/scripts/Dpkg/Vars.pm
index 31e4d0fb4..000753270 100644
--- a/scripts/Dpkg/Vars.pm
+++ b/scripts/Dpkg/Vars.pm
@@ -39,12 +39,11 @@ sub set_source_package {
my $err = pkg_name_is_illegal($v);
error(_g("source package name '%s' is illegal: %s"), $v, $err) if $err;
- if (defined($sourcepackage)) {
- $v eq $sourcepackage ||
- error(_g('source package has two conflicting values - %s and %s'),
- $sourcepackage, $v);
- } else {
+ if (not defined($sourcepackage)) {
$sourcepackage = $v;
+ } elsif ($v ne $sourcepackage) {
+ error(_g('source package has two conflicting values - %s and %s'),
+ $sourcepackage, $v);
}
}
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 18ee74731..4601f3f3c 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -204,33 +204,35 @@ while (@ARGV) {
} elsif (/^-nc$/) {
$noclean = 1;
} elsif (/^-b$/) {
- build_sourceonly && usageerr(_g('cannot combine %s and %s'), $_, '-S');
+ usageerr(_g('cannot combine %s and %s'), $_, '-S') if build_sourceonly;
$include = BUILD_BINARY;
push @changes_opts, '-b';
@checkbuilddep_opts = ();
$buildtarget = 'build';
$binarytarget = 'binary';
} elsif (/^-B$/) {
- build_sourceonly && usageerr(_g('cannot combine %s and %s'), $_, '-S');
+ usageerr(_g('cannot combine %s and %s'), $_, '-S') if build_sourceonly;
$include = BUILD_ARCH_DEP;
push @changes_opts, '-B';
@checkbuilddep_opts = qw(-B);
$buildtarget = 'build-arch';
$binarytarget = 'binary-arch';
} elsif (/^-A$/) {
- build_sourceonly && usageerr(_g('cannot combine %s and %s'), $_, '-S');
+ usageerr(_g('cannot combine %s and %s'), $_, '-S') if build_sourceonly;
$include = BUILD_ARCH_INDEP;
push @changes_opts, '-A';
@checkbuilddep_opts = qw(-A);
$buildtarget = 'build-indep';
$binarytarget = 'binary-indep';
} elsif (/^-S$/) {
- build_binaryonly && usageerr(_g('cannot combine %s and %s'), build_opt, '-S');
+ usageerr(_g('cannot combine %s and %s'), build_opt, '-S')
+ if build_binaryonly;
$include = BUILD_SOURCE;
push @changes_opts, '-S';
@checkbuilddep_opts = qw(-A -B);
} elsif (/^-F$/) {
- !build_normal && usageerr(_g('cannot combine %s and %s'), $_, build_opt);
+ usageerr(_g('cannot combine %s and %s'), $_, build_opt)
+ if not build_normal;
$include = BUILD_ALL;
@checkbuilddep_opts = ();
} elsif (/^-v(.*)$/) {
diff --git a/scripts/dpkg-distaddfile.pl b/scripts/dpkg-distaddfile.pl
index 34d6339fd..d027af8a8 100755
--- a/scripts/dpkg-distaddfile.pl
+++ b/scripts/dpkg-distaddfile.pl
@@ -68,8 +68,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
usageerr(_g("unknown option \`%s'"), $_);
}
}
+usageerr(_g('need exactly a filename, section and priority')) if @ARGV != 3;
-@ARGV == 3 || usageerr(_g('need exactly a filename, section and priority'));
my ($file, $section, $priority) = @ARGV;
($file =~ m/\s/ || $section =~ m/\s/ || $priority =~ m/\s/) &&
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 5b34f75f9..f26025e5d 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -141,18 +141,19 @@ sub usage {
while (@ARGV) {
$_=shift(@ARGV);
if (m/^-b$/) {
- is_sourceonly && usageerr(_g('cannot combine %s and %s'), $_, '-S');
+ usageerr(_g('cannot combine %s and %s'), $_, '-S') if is_sourceonly;
$include = BIN;
} elsif (m/^-B$/) {
- is_sourceonly && usageerr(_g('cannot combine %s and %s'), $_, '-S');
+ usageerr(_g('cannot combine %s and %s'), $_, '-S') if is_sourceonly;
$include = ARCH_DEP;
printf STDERR _g('%s: arch-specific upload - not including arch-independent packages') . "\n", $Dpkg::PROGNAME;
} elsif (m/^-A$/) {
- is_sourceonly && usageerr(_g('cannot combine %s and %s'), $_, '-S');
+ usageerr(_g('cannot combine %s and %s'), $_, '-S') if is_sourceonly;
$include = ARCH_INDEP;
printf STDERR _g('%s: arch-indep upload - not including arch-specific packages') . "\n", $Dpkg::PROGNAME;
} elsif (m/^-S$/) {
- is_binaryonly && usageerr(_g('cannot combine %s and %s'), binary_opt, '-S');
+ usageerr(_g('cannot combine %s and %s'), binary_opt, '-S')
+ if is_binaryonly;
$include = SOURCE;
} elsif (m/^-s([iad])$/) {
$sourcestyle= $1;
@@ -233,17 +234,16 @@ if (not is_sourceonly) {
syserr(_g('cannot read files list file'));
while(<$fileslist_fh>) {
if (m/^(([-+.0-9a-z]+)_([^_]+)_([-\w]+)\.u?deb) (\S+) (\S+)$/) {
- defined($p2f{"$2 $4"}) &&
- warning(_g('duplicate files list entry for package %s (line %d)'),
- $2, $.);
+ warning(_g('duplicate files list entry for package %s (line %d)'),
+ $2, $.) if defined $p2f{"$2 $4"};
$f2p{$1}= $2;
$pa2f{"$2 $4"}= $1;
$p2f{$2} ||= [];
push @{$p2f{$2}}, $1;
$p2ver{$2}= $3;
- defined($f2sec{$1}) &&
- warning(_g('duplicate files list entry for file %s (line %d)'),
- $1, $.);
+
+ warning(_g('duplicate files list entry for file %s (line %d)'),
+ $1, $.) if defined $f2sec{$1};
$f2sec{$1}= $5;
$f2pri{$1}= $6;
push(@archvalues, $4) if $4 and not $archadded{$4}++;
@@ -255,9 +255,8 @@ if (not is_sourceonly) {
push(@archvalues, $2) if $2 and not $archadded{$2}++;
push(@fileslistfiles,$1);
} elsif (m/^([-+.,_0-9a-zA-Z]+) (\S+) (\S+)$/) {
- defined($f2sec{$1}) &&
- warning(_g('duplicate files list entry for file %s (line %d)'),
- $1, $.);
+ warning(_g('duplicate files list entry for file %s (line %d)'),
+ $1, $.) if defined $f2sec{$1};
$f2sec{$1}= $2;
$f2pri{$1}= $3;
push(@fileslistfiles,$1);
@@ -355,9 +354,9 @@ if ($changesdescription) {
for my $pa (keys %pa2f) {
my ($pp, $aa) = (split / /, $pa);
- defined($control->get_pkg_by_name($pp)) ||
- warning(_g('package %s listed in files list but not in control info'),
- $pp);
+
+ warning(_g('package %s listed in files list but not in control info'), $pp)
+ unless defined $control->get_pkg_by_name($pp);
}
for my $p (keys %p2f) {
@@ -370,18 +369,21 @@ for my $p (keys %p2f) {
$sec = '-';
warning(_g("missing Section for binary package %s; using '-'"), $p);
}
- $sec eq $f2sec{$f} || error(_g('package %s has section %s in ' .
- 'control file but %s in files list'),
- $p, $sec, $f2sec{$f});
+ if ($sec ne $f2sec{$f}) {
+ error(_g('package %s has section %s in control file but %s in ' .
+ 'files list'), $p, $sec, $f2sec{$f});
+ }
+
my $pri = $f2pricf{$f};
$pri ||= $sourcedefault{'Priority'};
if (!defined($pri)) {
$pri = '-';
warning(_g("missing Priority for binary package %s; using '-'"), $p);
}
- $pri eq $f2pri{$f} || error(_g('package %s has priority %s in ' .
- 'control file but %s in files list'),
- $p, $pri, $f2pri{$f});
+ if ($pri ne $f2pri{$f}) {
+ error(_g('package %s has priority %s in control file but %s in ' .
+ 'files list'), $p, $pri, $f2pri{$f});
+ }
}
}
@@ -501,13 +503,13 @@ $fields->{'Maintainer'} = $forcemaint if defined($forcemaint);
$fields->{'Changed-By'} = $forcechangedby if defined($forcechangedby);
for my $f (qw(Version Distribution Maintainer Changes)) {
- defined($fields->{$f}) ||
- error(_g('missing information for critical output field %s'), $f);
+ error(_g('missing information for critical output field %s'), $f)
+ unless defined $fields->{$f};
}
for my $f (qw(Urgency)) {
- defined($fields->{$f}) ||
- warning(_g('missing information for output field %s'), $f);
+ warning(_g('missing information for output field %s'), $f)
+ unless defined $fields->{$f};
}
for my $f (keys %override) {
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 404f3e124..c60101395 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -172,7 +172,9 @@ my $pkg;
if (defined($oppackage)) {
$pkg = $control->get_pkg_by_name($oppackage);
- defined($pkg) || error(_g('package %s not in control info'), $oppackage);
+ if (not defined $pkg) {
+ error(_g('package %s not in control info'), $oppackage)
+ }
} else {
my @packages = map { $_->{'Package'} } $control->get_packages();
if (@packages == 0) {
@@ -296,10 +298,12 @@ foreach my $field (field_list_pkg_dep()) {
}
for my $f (qw(Package Version)) {
- defined($fields->{$f}) || error(_g('missing information for output field %s'), $f);
+ error(_g('missing information for output field %s'), $f)
+ unless defined $fields->{$f};
}
for my $f (qw(Maintainer Description Architecture)) {
- defined($fields->{$f}) || warning(_g('missing information for output field %s'), $f);
+ warning(_g('missing information for output field %s'), $f)
+ unless defined $fields->{$f};
}
$oppackage = $fields->{'Package'};
@@ -324,8 +328,10 @@ if ($oppackage ne $sourcepackage || $verdiff) {
}
if (!defined($substvars->get('Installed-Size'))) {
- my $du_fh;
- defined(my $c = open($du_fh, '-|')) || syserr(_g('cannot fork for %s'), 'du');
+ my $c = open(my $du_fh, '-|');
+ if (not defined $c) {
+ syserr(_g('cannot fork for %s'), 'du');
+ }
if (!$c) {
chdir("$packagebuilddir") ||
syserr(_g("chdir for du to \`%s'"), $packagebuilddir);
@@ -337,9 +343,10 @@ if (!defined($substvars->get('Installed-Size'))) {
$duo .= $_;
}
close($du_fh);
- $? && subprocerr(_g("du in \`%s'"), $packagebuilddir);
- $duo =~ m/^(\d+)\s+\.$/ ||
+ subprocerr(_g("du in \`%s'"), $packagebuilddir) if $?;
+ if ($duo !~ m/^(\d+)\s+\.$/) {
error(_g("du gave unexpected output \`%s'"), $duo);
+ }
$substvars->set_as_used('Installed-Size', $1);
}
if (defined($substvars->get('Extra-Size'))) {
diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index 5736895a2..5f86f84c6 100755
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -121,8 +121,7 @@ while (@ARGV) {
usageerr(_g("unknown option \`%s'"), $_);
}
}
-
-@ARGV && usageerr(_g('takes no non-option arguments'));
+usageerr(_g('takes no non-option arguments')) if @ARGV;
my $count = 0;
my @fields = changelog_parse(%options);
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 767279595..ded62d673 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -175,9 +175,12 @@ else {
my ($binarydir, $override, $pathprefix) = @ARGV;
--d $binarydir or error(_g('binary dir %s not found'), $binarydir);
-defined($override) and (-e $override or
- error(_g('override file %s not found'), $override));
+if (not -d $binarydir) {
+ error(_g('binary dir %s not found'), $binarydir);
+}
+if (defined $override and not -e $override) {
+ error(_g('override file %s not found'), $override);
+}
$pathprefix //= '';
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 9144b76e0..0daabacea 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -301,7 +301,8 @@ sub main {
local $SIG{__WARN__} = sub { usageerr($_[0]) };
GetOptions(@option_spec);
}
- @ARGV >= 1 and @ARGV <= 3 or usageerr(_g('one to three arguments expected'));
+ usageerr(_g('one to three arguments expected'))
+ if @ARGV < 1 or @ARGV > 3;
push @ARGV, undef if @ARGV < 2;
push @ARGV, '' if @ARGV < 3;
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 0b92fe51f..59abb417e 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -101,13 +101,15 @@ foreach (@ARGV) {
version(); exit(0);
} elsif (m/^--admindir=(.*)$/) {
$admindir = $1;
- -d $admindir ||
+ if (not -d $admindir) {
error(_g("administrative directory '%s' does not exist"), $admindir);
+ }
$ENV{DPKG_ADMINDIR} = $admindir;
} elsif (m/^-d(.*)$/) {
$dependencyfield = field_capitalize($1);
- defined($depstrength{$dependencyfield}) ||
+ if (not defined $depstrength{$dependencyfield}) {
warning(_g("unrecognized dependency field '%s'"), $dependencyfield);
+ }
} elsif (m/^-e(.*)$/) {
if (exists $exec{$1}) {
# Affect the binary to the most important field
@@ -140,8 +142,7 @@ foreach (@ARGV) {
}
}
}
-
-scalar keys %exec || usageerr(_g('need at least one executable'));
+usageerr(_g('need at least one executable')) unless scalar keys %exec;
my $control = Dpkg::Control::Info->new();
my $fields = $control->get_source();