Use ||= instead of checking if the variables are not defined

diff --git a/ChangeLog b/ChangeLog
index 93b1463ffa0bd0b3dc369c69b8620fcf136ea670..1d1e51952bc0574f814292f0bcf818d5aee354a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-12  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-genchanges.pl: Use ||= instead of checking if the
+       variables are not defined.
+       * scripts/dpkg-gencontrol.pl: Likewise.
+       * scripts/update-alternatives.pl (fill_missing_slavepaths): Likewise.
+
 2007-12-11  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Deps.pm: Add a compare function that compares

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 9ff8a8d6f028daa3ca59992e78daa3e3562006a0..81d39932be969f795090d40b27bf37efde1f7252 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -333,7 +333,7 @@ for my $p (keys %p2f) {
 
     foreach my $f (@f) {
        my $sec = $f2seccf{$f};
-       $sec = $sourcedefault{'Section'} if !defined($sec);
+       $sec ||= $sourcedefault{'Section'};
        if (!defined($sec)) {
            $sec = '-';
            warning(_g("missing Section for binary package %s; using '-'"), $p);
@@ -342,7 +342,7 @@ for my $p (keys %p2f) {
                                       "control file but %s in files list"),
                                    $p, $sec, $f2sec{$f});
        my $pri = $f2pricf{$f};
-       $pri = $sourcedefault{'Priority'} if !defined($pri);
+       $pri ||= $sourcedefault{'Priority'};
        if (!defined($pri)) {
            $pri = '-';
            warning(_g("missing Priority for binary package %s; using '-'"), $p);

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 6dd76aca1762c401a48397d61c1e9c2549418815..b70d63bc8fd0282273d8f09db1c9a7b78cf5ac3e 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -163,7 +163,7 @@ for $_ (keys %fi) {
            $f{$_} = $v;
        } elsif (m/^(Section|Priority|Homepage)$/) {
            # Binary package stanzas can override these fields
-           $f{$_} = $v if !defined($f{$_});
+           $f{$_} ||= $v;
        } elsif (m/^Source$/) {
            setsourcepackage($v);
        }

diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 12eb2ec1a14888e9ea5ecb05c0cc34bd9bd0d3c6..8e7fb671cc1bf252d932b329d685736f3e5d0033 100755 (executable)
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -170,7 +170,7 @@ sub fill_missing_slavepaths()
 {
     for (my $j = 0; $j <= $#slavenames; $j++) {
        for (my $i = 0; $i <= $#versions; $i++) {
-           $slavepath{$i,$j} = '' if !defined $slavepath{$i,$j};
+           $slavepath{$i,$j} ||= '';
        }
     }
 }