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=7ca052dc464073153e54e213a4b9b10cb30bc681 commit 7ca052dc464073153e54e213a4b9b10cb30bc681 Author: Guillem Jover <guil...@debian.org> AuthorDate: Sat Dec 17 06:04:33 2022 +0100 dselect: Rename functions with names containing block to stanza Apply the same «stanza» term usage unification matching the documentation fixes, to function names. --- dselect/methods/ftp/install.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl index aa6cecaa7..262822cb1 100755 --- a/dselect/methods/ftp/install.pl +++ b/dselect/methods/ftp/install.pl @@ -73,12 +73,12 @@ if (-f "$methdir/md5sums") { if (ref($res)) { %md5sums = %{$res} } } -# get a block +# Get a stanza. # returns a ref to a hash containing flds->fld contents # white space from the ends of lines is removed and newlines added # (no trailing newline). # die's if something unexpected happens -sub getblk { +sub get_stanza { my $fh = shift; my %flds; my $fld; @@ -116,7 +116,7 @@ sub procstatus { my (%flds, $fld); open(my $status_fh, '<', "$vardir/status") or die 'Could not open status file'; - while (%flds = getblk($status_fh), %flds) { + while (%flds = get_stanza($status_fh), %flds) { if($flds{'status'} =~ /^install ok/) { my $cs = (split(/ /, $flds{'status'}))[2]; if (($cs eq 'not-installed') || @@ -158,7 +158,7 @@ sub procpkgfile { my (@files, @sizes, @md5sums, $pkg, $ver, $nfs, $fld); my(%flds); open(my $pkgfile_fh, '<', $fn) or die "could not open package file $fn"; - while (%flds = getblk($pkgfile_fh), %flds) { + while (%flds = get_stanza($pkgfile_fh), %flds) { $pkg = $flds{'package'}; $ver = $curpkgs{$pkg}; @files = split(/[\s\n]+/, $flds{'filename'}); @@ -466,7 +466,7 @@ sub getdebinfo($) { if($type == 1) { open(my $pkgfile_fh, '-|', "dpkg-deb --field $fn") or die "cannot create pipe for 'dpkg-deb --field $fn'"; - my %fields = getblk($pkgfile_fh); + my %fields = get_stanza($pkgfile_fh); close($pkgfile_fh); $pkg = $fields{'package'}; $ver = $fields{'version'}; -- Dpkg.Org's dpkg
