This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3465ceb0be34fa6502ba02eaa672c1f842269b2e commit 3465ceb0be34fa6502ba02eaa672c1f842269b2e Author: Guillem Jover <[email protected]> AuthorDate: Tue Feb 21 02:07:58 2023 +0100 perl: Rename Dpkg::Control variables from $f to $c or $ctrl Avoid the potential confusion. --- scripts/Dpkg/Changelog.pm | 66 +++++++++++++++++----------------- scripts/Dpkg/Changelog/Entry.pm | 2 +- scripts/Dpkg/Changelog/Entry/Debian.pm | 28 +++++++-------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm index dbe3c5eca..4f44ec0bb 100644 --- a/scripts/Dpkg/Changelog.pm +++ b/scripts/Dpkg/Changelog.pm @@ -505,15 +505,15 @@ sub _format_dpkg { my @data = $self->get_range($range) or return; my $src = shift @data; - my $f = Dpkg::Control::Changelog->new(); - $f->{Urgency} = $src->get_urgency() || 'unknown'; - $f->{Source} = $src->get_source() || 'unknown'; - $f->{Version} = $src->get_version() // 'unknown'; - $f->{Distribution} = join(' ', $src->get_distributions()); - $f->{Maintainer} = $src->get_maintainer() // ''; - $f->{Date} = $src->get_timestamp() // ''; - $f->{Timestamp} = $src->get_timepiece && $src->get_timepiece->epoch // ''; - $f->{Changes} = $src->get_dpkg_changes(); + my $c = Dpkg::Control::Changelog->new(); + $c->{Urgency} = $src->get_urgency() || 'unknown'; + $c->{Source} = $src->get_source() || 'unknown'; + $c->{Version} = $src->get_version() // 'unknown'; + $c->{Distribution} = join ' ', $src->get_distributions(); + $c->{Maintainer} = $src->get_maintainer() // ''; + $c->{Date} = $src->get_timestamp() // ''; + $c->{Timestamp} = $src->get_timepiece && $src->get_timepiece->epoch // ''; + $c->{Changes} = $src->get_dpkg_changes(); # handle optional fields my $opts = $src->get_optional_fields(); @@ -523,35 +523,35 @@ sub _format_dpkg { } elsif (/^Closes$/i) { $closes{$_} = 1 foreach (split(/\s+/, $opts->{Closes})); } else { - field_transfer_single($opts, $f, $_); + field_transfer_single($opts, $c, $_); } } foreach my $bin (@data) { - my $oldurg = $f->{Urgency} // ''; - my $oldurgn = $URGENCIES{$f->{Urgency}} // -1; + my $oldurg = $c->{Urgency} // ''; + my $oldurgn = $URGENCIES{$c->{Urgency}} // -1; my $newurg = $bin->get_urgency() // ''; my $newurgn = $URGENCIES{$newurg} // -1; - $f->{Urgency} = ($newurgn > $oldurgn) ? $newurg : $oldurg; - $f->{Changes} .= "\n" . $bin->get_dpkg_changes(); + $c->{Urgency} = ($newurgn > $oldurgn) ? $newurg : $oldurg; + $c->{Changes} .= "\n" . $bin->get_dpkg_changes(); # handle optional fields $opts = $bin->get_optional_fields(); foreach (keys %$opts) { if (/^Closes$/i) { $closes{$_} = 1 foreach (split(/\s+/, $opts->{Closes})); - } elsif (not exists $f->{$_}) { # Don't overwrite an existing field - field_transfer_single($opts, $f, $_); + } elsif (not exists $c->{$_}) { # Don't overwrite an existing field + field_transfer_single($opts, $c, $_); } } } if (scalar keys %closes) { - $f->{Closes} = join ' ', sort { $a <=> $b } keys %closes; + $c->{Closes} = join ' ', sort { $a <=> $b } keys %closes; } - run_vendor_hook('post-process-changelog-entry', $f); + run_vendor_hook('post-process-changelog-entry', $c); - return $f; + return $c; } sub _format_rfc822 { @@ -561,25 +561,25 @@ sub _format_rfc822 { my @ctrl; foreach my $entry (@data) { - my $f = Dpkg::Control::Changelog->new(); - $f->{Urgency} = $entry->get_urgency() || 'unknown'; - $f->{Source} = $entry->get_source() || 'unknown'; - $f->{Version} = $entry->get_version() // 'unknown'; - $f->{Distribution} = join(' ', $entry->get_distributions()); - $f->{Maintainer} = $entry->get_maintainer() // ''; - $f->{Date} = $entry->get_timestamp() // ''; - $f->{Timestamp} = $entry->get_timepiece && $entry->get_timepiece->epoch // ''; - $f->{Changes} = $entry->get_dpkg_changes(); + my $c = Dpkg::Control::Changelog->new(); + $c->{Urgency} = $entry->get_urgency() || 'unknown'; + $c->{Source} = $entry->get_source() || 'unknown'; + $c->{Version} = $entry->get_version() // 'unknown'; + $c->{Distribution} = join ' ', $entry->get_distributions(); + $c->{Maintainer} = $entry->get_maintainer() // ''; + $c->{Date} = $entry->get_timestamp() // ''; + $c->{Timestamp} = $entry->get_timepiece && $entry->get_timepiece->epoch // ''; + $c->{Changes} = $entry->get_dpkg_changes(); # handle optional fields my $opts = $entry->get_optional_fields(); foreach (keys %$opts) { - field_transfer_single($opts, $f, $_) unless exists $f->{$_}; + field_transfer_single($opts, $c, $_) unless exists $c->{$_}; } - run_vendor_hook('post-process-changelog-entry', $f); + run_vendor_hook('post-process-changelog-entry', $c); - push @ctrl, $f; + push @ctrl, $c; } return @ctrl; @@ -666,8 +666,8 @@ sub format_range { } else { my $index = Dpkg::Index->new(type => CTRL_CHANGELOG); - foreach my $f (@ctrl) { - $index->add($f); + foreach my $c (@ctrl) { + $index->add($c); } return $index; diff --git a/scripts/Dpkg/Changelog/Entry.pm b/scripts/Dpkg/Changelog/Entry.pm index 803c5b4a1..cf075b7cf 100644 --- a/scripts/Dpkg/Changelog/Entry.pm +++ b/scripts/Dpkg/Changelog/Entry.pm @@ -240,7 +240,7 @@ sub get_distributions { return; } -=item $fields = $entry->get_optional_fields() +=item $ctrl = $entry->get_optional_fields() Return a set of optional fields exposed by the changelog entry. It always returns a Dpkg::Control object (possibly empty though). diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm index f48b5a5c8..13c0014c6 100644 --- a/scripts/Dpkg/Changelog/Entry/Debian.pm +++ b/scripts/Dpkg/Changelog/Entry/Debian.pm @@ -166,7 +166,7 @@ sub parse_header { my $options = $4; $options =~ s/^\s+//; - my $f = Dpkg::Control::Changelog->new(); + my $c = Dpkg::Control::Changelog->new(); foreach my $opt (split(/\s*,\s*/, $options)) { unless ($opt =~ m/^([-0-9a-z]+)\=\s*(.*\S)$/i) { push @errors, sprintf(g_("bad key-value after ';': '%s'"), $opt); @@ -174,10 +174,10 @@ sub parse_header { } ## no critic (RegularExpressions::ProhibitCaptureWithoutTest) my ($k, $v) = (field_capitalize($1), $2); - if (exists $f->{$k}) { + if (exists $c->{$k}) { push @errors, sprintf(g_('repeated key-value %s'), $k); } else { - $f->{$k} = $v; + $c->{$k} = $v; } if ($k eq 'Urgency') { push @errors, sprintf(g_('badly formatted urgency value: %s'), $v) @@ -190,7 +190,7 @@ sub parse_header { push @errors, sprintf(g_('unknown key-value %s'), $k); } } - $self->{header_fields} = $f; + $self->{header_fields} = $c; } else { push @errors, g_("the header doesn't match the expected regex"); } @@ -294,7 +294,7 @@ sub get_distributions { return; } -=item $fields = $entry->get_optional_fields() +=item $ctrl = $entry->get_optional_fields() Return a set of optional fields exposed by the changelog entry. It always returns a Dpkg::Control object (possibly empty though). @@ -303,20 +303,20 @@ It always returns a Dpkg::Control object (possibly empty though). sub get_optional_fields { my $self = shift; - my $f; + my $c; if (defined $self->{header_fields}) { - $f = $self->{header_fields}; + $c = $self->{header_fields}; } else { - $f = Dpkg::Control::Changelog->new(); + $c = Dpkg::Control::Changelog->new(); } my @closes = find_closes(join("\n", @{$self->{changes}})); if (@closes) { - $f->{Closes} = join(' ', @closes); + $c->{Closes} = join ' ', @closes; } - return $f; + return $c; } =item $urgency = $entry->get_urgency() @@ -327,10 +327,10 @@ Return the urgency of the associated upload. sub get_urgency { my $self = shift; - my $f = $self->get_optional_fields(); - if (exists $f->{Urgency}) { - $f->{Urgency} =~ s/\s.*$//; - return lc($f->{Urgency}); + my $c = $self->get_optional_fields(); + if (exists $c->{Urgency}) { + $c->{Urgency} =~ s/\s.*$//; + return lc $c->{Urgency}; } return; } -- Dpkg.Org's dpkg
