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=0e7694ceb00248516048fd54caa72fd9e4b4eb6d commit 0e7694ceb00248516048fd54caa72fd9e4b4eb6d Author: Guillem Jover <[email protected]> AuthorDate: Mon Aug 5 23:29:39 2024 +0200 scripts: Rename changelog options in programs to %changelog_opts This should make it clear these are not general program options. --- scripts/dpkg-genbuildinfo.pl | 12 ++++++------ scripts/dpkg-genchanges.pl | 16 ++++++++-------- scripts/dpkg-gencontrol.pl | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl index 3b4bd5dda..895506c8a 100755 --- a/scripts/dpkg-genbuildinfo.pl +++ b/scripts/dpkg-genbuildinfo.pl @@ -424,14 +424,14 @@ my $fields = Dpkg::Control->new(type => CTRL_FILE_BUILDINFO); my $dist = Dpkg::Dist::Files->new(); # Retrieve info from the current changelog entry. -my %options = (file => $changelogfile); -$options{changelogformat} = $changelogformat if $changelogformat; -my $changelog = changelog_parse(%options); +my %changelog_opts = (file => $changelogfile); +$changelog_opts{changelogformat} = $changelogformat if $changelogformat; +my $changelog = changelog_parse(%changelog_opts); # Retrieve info from the former changelog entry to handle binNMUs. -$options{count} = 1; -$options{offset} = 1; -my $prev_changelog = changelog_parse(%options); +$changelog_opts{count} = 1; +$changelog_opts{offset} = 1; +my $prev_changelog = changelog_parse(%changelog_opts); my $sourceversion = Dpkg::Version->new($changelog->{'Binary-Only'} ? $prev_changelog->{'Version'} : $changelog->{'Version'}); diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl index 10a8ceb47..cb985023a 100755 --- a/scripts/dpkg-genchanges.pl +++ b/scripts/dpkg-genchanges.pl @@ -213,15 +213,15 @@ if (not defined $outputfile) { } # Retrieve info from the current changelog entry -my %options = (file => $changelogfile); -$options{changelogformat} = $changelogformat if $changelogformat; -$options{since} = $since if defined($since); -my $changelog = changelog_parse(%options); +my %changelog_opts = (file => $changelogfile); +$changelog_opts{changelogformat} = $changelogformat if $changelogformat; +$changelog_opts{since} = $since if defined($since); +my $changelog = changelog_parse(%changelog_opts); # Change options to retrieve info of the former changelog entry -delete $options{since}; -$options{count} = 1; -$options{offset} = 1; -my $prev_changelog = changelog_parse(%options); +delete $changelog_opts{since}; +$changelog_opts{count} = 1; +$changelog_opts{offset} = 1; +my $prev_changelog = changelog_parse(%changelog_opts); # Other initializations my $control = Dpkg::Control::Info->new($controlfile); my $fields = Dpkg::Control->new(type => CTRL_FILE_CHANGES); diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index fb69fab5b..56f1bdc6a 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -143,13 +143,13 @@ while (@ARGV) { } umask 0022; # ensure sane default permissions for created files -my %options = (file => $changelogfile); -$options{changelogformat} = $changelogformat if $changelogformat; -my $changelog = changelog_parse(%options); +my %changelog_opts = (file => $changelogfile); +$changelog_opts{changelogformat} = $changelogformat if $changelogformat; +my $changelog = changelog_parse(%changelog_opts); if ($changelog->{'Binary-Only'}) { - $options{count} = 1; - $options{offset} = 1; - my $prev_changelog = changelog_parse(%options); + $changelog_opts{count} = 1; + $changelog_opts{offset} = 1; + my $prev_changelog = changelog_parse(%changelog_opts); $sourceversion = $prev_changelog->{'Version'}; } else { $sourceversion = $changelog->{'Version'}; -- Dpkg.Org's dpkg
