The following commit has been merged in the master branch:
commit 6024a66abdf9e49f29099a49c0f057459d77df80
Author: Guillem Jover <[email protected]>
Date: Sun Dec 30 15:13:44 2012 +0100
scripts: Use // operator instead of an explicit defined check
diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 1fb479b..48f72af 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -120,7 +120,7 @@ sub set {
if ($key =~ /^(noopt|nostrip|nocheck)$/ && defined($value)) {
$value = undef;
} elsif ($key eq 'parallel') {
- $value = "" if not defined($value);
+ $value //= "";
return 0 if $value !~ /^\d*$/;
}
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 0ceda5c..624fc16 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -326,7 +326,7 @@ sub __sanity_check_range {
sub get_range {
my ($self, $range) = @_;
- $range = {} unless defined $range;
+ $range //= {};
my $res = $self->_data_range($range);
if (defined $res) {
return @$res if wantarray;
@@ -523,8 +523,7 @@ sub dpkg {
my $f = Dpkg::Control::Changelog->new();
$f->{Urgency} = $entry->get_urgency() || "unknown";
$f->{Source} = $entry->get_source() || "unknown";
- $f->{Version} = $entry->get_version();
- $f->{Version} = "unknown" unless defined $f->{Version};
+ $f->{Version} = $entry->get_version() // "unknown";
$f->{Distribution} = join(" ", $entry->get_distributions());
$f->{Maintainer} = $entry->get_maintainer() || '';
$f->{Date} = $entry->get_timestamp() || '';
@@ -589,8 +588,7 @@ sub rfc822 {
my $f = Dpkg::Control::Changelog->new();
$f->{Urgency} = $entry->get_urgency() || "unknown";
$f->{Source} = $entry->get_source() || "unknown";
- $f->{Version} = $entry->get_version();
- $f->{Version} = "unknown" unless defined $f->{Version};
+ $f->{Version} = $entry->get_version() // "unknown";
$f->{Distribution} = join(" ", $entry->get_distributions());
$f->{Maintainer} = $entry->get_maintainer() || "";
$f->{Date} = $entry->get_timestamp() || "";
diff --git a/scripts/Dpkg/Control/Fields.pm b/scripts/Dpkg/Control/Fields.pm
index b3c61f9..f8db7d4 100644
--- a/scripts/Dpkg/Control/Fields.pm
+++ b/scripts/Dpkg/Control/Fields.pm
@@ -440,7 +440,7 @@ added to $to otherwise.
sub field_transfer_single($$;$) {
my ($from, $to, $field) = @_;
- $field = $_ unless defined $field;
+ $field //= $_;
my ($from_type, $to_type) = ($from->get_type(), $to->get_type());
$field = field_capitalize($field);
diff --git a/scripts/Dpkg/Shlibs.pm b/scripts/Dpkg/Shlibs.pm
index 1a40b8f..1eae995 100644
--- a/scripts/Dpkg/Shlibs.pm
+++ b/scripts/Dpkg/Shlibs.pm
@@ -105,7 +105,7 @@ sub parse_ldso_conf {
# find_library ($soname, \@rpath, $format, $root)
sub find_library {
my ($lib, $rpath, $format, $root) = @_;
- $root = "" if not defined($root);
+ $root //= "";
$root =~ s{/+$}{};
my @rpath = @{$rpath};
foreach my $dir (@rpath, @librarypaths) {
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm
b/scripts/Dpkg/Shlibs/SymbolFile.pm
index c5204b8..abeae80 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -85,7 +85,7 @@ sub new {
my $class = ref($this) || $this;
my $self = \%opts;
bless $self, $class;
- $self->{arch} = get_host_arch() unless defined $self->{arch};
+ $self->{arch} //= get_host_arch();
$self->clear();
if (exists $self->{file}) {
$self->load($self->{file}) if -e $self->{file};
@@ -333,7 +333,7 @@ sub output {
# Returns a pattern which matches (if any).
sub find_matching_pattern {
my ($self, $refsym, $sonames, $inc_deprecated) = @_;
- $inc_deprecated = 0 unless defined $inc_deprecated;
+ $inc_deprecated //= 0;
my $name = (ref $refsym) ? $refsym->get_symbolname() : $refsym;
my $pattern_ok = sub {
@@ -472,19 +472,19 @@ sub create_object {
sub get_dependency {
my ($self, $soname, $dep_id) = @_;
- $dep_id = 0 unless defined($dep_id);
+ $dep_id //= 0;
return $self->get_object($soname)->{deps}[$dep_id];
}
sub get_smallest_version {
my ($self, $soname, $dep_id) = @_;
- $dep_id = 0 unless defined($dep_id);
+ $dep_id //= 0;
my $so_object = $self->get_object($soname);
return $so_object->{minver_cache}[$dep_id]
if(defined($so_object->{minver_cache}[$dep_id]));
my $minver;
foreach my $sym ($self->get_symbols($so_object)) {
next if $dep_id != $sym->{dep_id};
- $minver = $sym->{minver} unless defined($minver);
+ $minver //= $sym->{minver};
if (version_compare($minver, $sym->{minver}) > 0) {
$minver = $sym->{minver};
}
@@ -512,7 +512,7 @@ sub get_field {
# $refsym may also be a symbol name.
sub lookup_symbol {
my ($self, $refsym, $sonames, $inc_deprecated) = @_;
- $inc_deprecated = 0 unless defined($inc_deprecated);
+ $inc_deprecated //= 0;
my $name = (ref $refsym) ? $refsym->get_symbolname() : $refsym;
foreach my $so ((ref($sonames) eq 'ARRAY') ? @$sonames : $sonames) {
@@ -532,7 +532,7 @@ sub lookup_symbol {
# $refpat may also be a pattern spec.
sub lookup_pattern {
my ($self, $refpat, $sonames, $inc_deprecated) = @_;
- $inc_deprecated = 0 unless defined($inc_deprecated);
+ $inc_deprecated //= 0;
# If $refsym is a string, we need to create a dummy ref symbol.
$refpat = $self->create_symbol($refpat, dummy => 1) if ! ref($refpat);
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 8ea7c0a..3de9afb 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -216,7 +216,7 @@ sub initialize {
sub upgrade_object_type {
my ($self, $update_format) = @_;
- $update_format = 1 unless defined $update_format;
+ $update_format //= 1;
$self->{'fields'}{'Format'} = '1.0'
unless exists $self->{'fields'}{'Format'};
my $format = $self->{'fields'}{'Format'};
@@ -227,7 +227,7 @@ sub upgrade_object_type {
my $module = "Dpkg::Source::Package::V$major";
$module .= "::$variant" if defined $variant;
eval "require $module; \$minor = \$${module}::CURRENT_MINOR_VERSION;";
- $minor = 0 unless defined $minor;
+ $minor //= 0;
if ($update_format) {
$self->{'fields'}{'Format'} = "$major.$minor";
$self->{'fields'}{'Format'} .= " ($variant)" if defined $variant;
diff --git a/scripts/Dpkg/Source/Package/V2.pm
b/scripts/Dpkg/Source/Package/V2.pm
index 9a164cc..c05d989 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -195,7 +195,7 @@ sub get_autopatch_name {
sub get_patches {
my ($self, $dir, %opts) = @_;
- $opts{"skip_auto"} = 0 unless defined($opts{"skip_auto"});
+ $opts{"skip_auto"} //= 0;
my @patches;
my $pd = "$dir/debian/patches";
my $auto_patch = $self->get_autopatch_name();
@@ -214,7 +214,7 @@ sub get_patches {
sub apply_patches {
my ($self, $dir, %opts) = @_;
- $opts{"skip_auto"} = 0 unless defined($opts{"skip_auto"});
+ $opts{"skip_auto"} //= 0;
my @patches = $self->get_patches($dir, %opts);
return unless scalar(@patches);
my $applied = File::Spec->catfile($dir, "debian", "patches",
".dpkg-source-applied");
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index f32a499..b41c64d 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -144,7 +144,7 @@ sub unapply_patches {
my $quilt = $self->build_quilt_object($dir);
- $opts{'verbose'} = 1 unless defined $opts{'verbose'};
+ $opts{'verbose'} //= 1;
my $pc_applied = $quilt->get_db_file("applied-patches");
my @applied = $quilt->applied();
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index 104bde6..2aa11ab 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -371,7 +371,7 @@ sub _intuit_file_patched {
sub analyze {
my ($self, $destdir, %opts) = @_;
- $opts{"verbose"} = 1 if not defined $opts{"verbose"};
+ $opts{"verbose"} //= 1;
my $diff = $self->get_filename();
my %filepatched;
my %dirtocreate;
diff --git a/scripts/Dpkg/Source/Quilt.pm b/scripts/Dpkg/Source/Quilt.pm
index a0c98f6..6c0d439 100644
--- a/scripts/Dpkg/Source/Quilt.pm
+++ b/scripts/Dpkg/Source/Quilt.pm
@@ -132,8 +132,8 @@ sub next {
sub push {
my ($self, %opts) = @_;
- $opts{"verbose"} = 0 unless defined($opts{"verbose"});
- $opts{"timestamp"} = fs_time($self->{'dir'}) unless
defined($opts{"timestamp"});
+ $opts{"verbose"} //= 0;
+ $opts{"timestamp"} //= fs_time($self->{'dir'});
my $patch = $self->next();
return unless defined $patch;
@@ -164,9 +164,9 @@ sub push {
sub pop {
my ($self, %opts) = @_;
- $opts{"verbose"} = 0 unless defined($opts{"verbose"});
- $opts{"timestamp"} = fs_time($self->{'dir'}) unless
defined($opts{"timestamp"});
- $opts{"reverse_apply"} = 0 unless defined($opts{"reverse_apply"});
+ $opts{"verbose"} //= 0;
+ $opts{"timestamp"} //= fs_time($self->{'dir'});
+ $opts{"reverse_apply"} //= 0;
my $patch = $self->top();
return unless defined $patch;
@@ -254,7 +254,7 @@ sub get_patch_dir {
sub read_patch_list {
my ($self, $file, %opts) = @_;
return () if not defined $file or not -f $file;
- $opts{"warn_options"} = 0 unless defined($opts{"warn_options"});
+ $opts{"warn_options"} //= 0;
my @patches;
open(my $series_fh, "<" , $file) || syserr(_g("cannot read %s"), $file);
while (defined($_ = <$series_fh>)) {
diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm
index 7e60fcf..2c878c9 100644
--- a/scripts/Dpkg/Vendor/Ubuntu.pm
+++ b/scripts/Dpkg/Vendor/Ubuntu.pm
@@ -111,8 +111,7 @@ sub run_hook {
my $build_opts = Dpkg::BuildOptions->new();
my $hardening;
if ($build_opts->has("hardening")) {
- $hardening = $build_opts->get("hardening");
- $hardening = 1 unless defined $hardening;
+ $hardening = $build_opts->get("hardening") // 1;
}
if ($build_opts->has("nohardening")) {
$hardening = 0;
diff --git a/scripts/dpkg-buildflags.pl b/scripts/dpkg-buildflags.pl
index f32dd46..77acc6f 100755
--- a/scripts/dpkg-buildflags.pl
+++ b/scripts/dpkg-buildflags.pl
@@ -93,7 +93,7 @@ while (@ARGV) {
}
}
-$action = "dump" unless defined($action);
+$action //= "dump";
my $build_flags = Dpkg::BuildFlags->new();
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index bb22040..516a593 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -380,9 +380,9 @@ if (open(my $fileslist_fh, "<", $fileslistfile)) {
}
my $sversion = $fields->{'Version'};
$sversion =~ s/^\d+://;
-$forcefilename = sprintf("%s_%s_%s.%s", $oppackage, $sversion,
- $fields->{'Architecture'} || "", $pkg_type)
- unless ($forcefilename);
+$forcefilename //= sprintf("%s_%s_%s.%s", $oppackage, $sversion,
+ $fields->{'Architecture'} || "", $pkg_type);
+
print($fileslistnew_fh $substvars->substvars(sprintf("%s %s %s\n",
$forcefilename,
$fields->{'Section'} || '-',
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index d6a5d87..683314b 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -235,7 +235,7 @@ sub join_lines($) {
# - a - => a
sub merge_block($$$;&) {
my ($o, $a, $b, $preprocess) = @_;
- $preprocess = \&join_lines unless defined $preprocess;
+ $preprocess //= \&join_lines;
$o = &$preprocess($o) if defined($o);
$a = &$preprocess($a) if defined($a);
$b = &$preprocess($b) if defined($b);
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index adbb1c4..a8304e6 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -170,7 +170,7 @@ my ($binarydir, $override, $pathprefix) = @ARGV;
defined($override) and (-e $override or
error(_g("Override file %s not found"), $override));
-$pathprefix = '' if not defined $pathprefix;
+$pathprefix //= '';
my $find_h = new IO::Handle;
open($find_h, '-|', 'find', '-L', "$binarydir/", @find_args, '-print')
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index bc258dc..8e5c543 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -705,7 +705,7 @@ sub extract_from_shlibs {
last;
}
} else {
- $dep = $depread unless defined $dep;
+ $dep //= $depread;
}
}
}
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index d36254d..5df9711 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -141,7 +141,7 @@ if (defined($options{'opmode'}) &&
while (@options) {
$_ = shift(@options);
if (m/^--format=(.*)$/) {
- $build_format = $1 unless defined $build_format;
+ $build_format //= $1;
} elsif (m/^-(?:Z|-compression=)(.*)$/) {
my $compression = $1;
$options{'compression'} = $compression;
diff --git a/scripts/dpkg-vendor.pl b/scripts/dpkg-vendor.pl
index e2f8cc0..1e95c48 100755
--- a/scripts/dpkg-vendor.pl
+++ b/scripts/dpkg-vendor.pl
@@ -80,7 +80,7 @@ while (@ARGV) {
usageerr(_g("need an action option")) unless defined($action);
# Uses $ENV{DEB_VENDOR} if set
-$vendor = get_current_vendor() unless defined($vendor);
+$vendor //= get_current_vendor();
my $info = get_vendor_info($vendor);
unless (defined($info)) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
