Просмотр исходного кода

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

Guillem Jover лет назад: 18
Родитель
Сommit
cd97956b9c
4 измененных файлов с 11 добавлено и 4 удалено
  1. 7 0
      ChangeLog
  2. 2 2
      scripts/dpkg-genchanges.pl
  3. 1 1
      scripts/dpkg-gencontrol.pl
  4. 1 1
      scripts/update-alternatives.pl

+ 7 - 0
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

+ 2 - 2
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);

+ 1 - 1
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);
 	}

+ 1 - 1
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} ||= '';
 	}
     }
 }