The branch, master has been updated
via 189e0a5c08e99eed95e26f4e2d9134ee28e24c70 (commit)
via 8406f059868768cb2c18c97386a2b444efec9a8f (commit)
via cd97956b9c8b705ad224e830d65c0c81e8e64370 (commit)
from c6c756d5594b107fea7712fe6b377d77abfc6ef2 (commit)
- Shortlog ------------------------------------------------------------
189e0a5 dpkg-genchanges: Fix typo (syserror() -> syserr())
8406f05 Use || to fallback to a default value instead of using !defined()
cd97956 Use ||= instead of checking if the variables are not defined
Summary of changes:
ChangeLog | 17 +++++++++++++++++
scripts/dpkg-genchanges.pl | 6 +++---
scripts/dpkg-gencontrol.pl | 6 ++----
scripts/update-alternatives.pl | 2 +-
4 files changed, 23 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 189e0a5c08e99eed95e26f4e2d9134ee28e24c70
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Dec 12 09:41:00 2007 +0200
dpkg-genchanges: Fix typo (syserror() -> syserr())
diff --git a/ChangeLog b/ChangeLog
index 6a89753..a012430 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-12-12 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-genchanges.pl: Fix typo (syserror() -> syserr()).
+
+2007-12-12 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-gencontrol.pl (spfileslistvalue): Use || to fallback to
a default value instead of using a temporary variable and checking if
it's not defined.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 81d3993..bd58653 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -372,7 +372,7 @@ if (!is_binaryonly) {
(my $sversion = $substvar{'source:Version'}) =~ s/^\d+://;
$dsc= "$uploadfilesdir/${sourcepackage}_${sversion}.dsc";
- open(CDATA,"<",$dsc) || syserror(_g("cannot open .dsc file %s"), $dsc);
+ open(CDATA, "<", $dsc) || syserr(_g("cannot open .dsc file %s"), $dsc);
push(@sourcefiles,"${sourcepackage}_${sversion}.dsc");
parsecdata(\*CDATA, 'S', -1, sprintf(_g("source control file %s"), $dsc));
commit 8406f059868768cb2c18c97386a2b444efec9a8f
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Dec 12 09:37:04 2007 +0200
Use || to fallback to a default value instead of using !defined()
diff --git a/ChangeLog b/ChangeLog
index 1d1e519..6a89753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-12-12 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-gencontrol.pl (spfileslistvalue): Use || to fallback to
+ a default value instead of using a temporary variable and checking if
+ it's not defined.
+
+2007-12-12 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-genchanges.pl: Use ||= instead of checking if the
variables are not defined.
* scripts/dpkg-gencontrol.pl: Likewise.
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index b70d63b..6194908 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -85,9 +85,7 @@ Options:
sub spfileslistvalue($)
{
- my $r = $f{$_[0]};
- $r = '-' if !defined($r);
- return $r;
+ return $f{$_[0]} || '-';
}
commit cd97956b9c8b705ad224e830d65c0c81e8e64370
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Dec 12 09:34:18 2007 +0200
Use ||= instead of checking if the variables are not defined
diff --git a/ChangeLog b/ChangeLog
index 93b1463..1d1e519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-12 Guillem Jover <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scripts/Dpkg/Deps.pm: Add a compare function that compares
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 9ff8a8d..81d3993 100755
--- 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 6dd76ac..b70d63b 100755
--- 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 12eb2ec..8e7fb67 100755
--- 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} ||= '';
}
}
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
