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=259fc17789e99fdcd0fe294d31ec53ef43a1f7a1 commit 259fc17789e99fdcd0fe294d31ec53ef43a1f7a1 Author: Guillem Jover <[email protected]> AuthorDate: Mon Nov 7 22:52:52 2022 +0100 Dpkg::Source::Package: Rename _sanity_check to _check_workdir These functions are checking the work tree directory, so make that explicit. Remove the unnecessary sanity term. --- scripts/Dpkg/Source/Package/V3/Bzr.pm | 6 +++--- scripts/Dpkg/Source/Package/V3/Git.pm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/Dpkg/Source/Package/V3/Bzr.pm b/scripts/Dpkg/Source/Package/V3/Bzr.pm index ed689125d..2f18fee77 100644 --- a/scripts/Dpkg/Source/Package/V3/Bzr.pm +++ b/scripts/Dpkg/Source/Package/V3/Bzr.pm @@ -50,7 +50,7 @@ sub prerequisites { 'bzr is not in the PATH')); } -sub _sanity_check { +sub _check_workdir { my $srcdir = shift; if (! -d "$srcdir/.bzr") { @@ -104,7 +104,7 @@ sub do_build { my $basedirname = $basename; $basedirname =~ s/_/-/; - _sanity_check($dir); + _check_workdir($dir); my $old_cwd = getcwd(); chdir $dir or syserr(g_("unable to chdir to '%s'"), $dir); @@ -197,7 +197,7 @@ sub do_extract { ); $tar->extract($newdirectory); - _sanity_check($newdirectory); + _check_workdir($newdirectory); my $old_cwd = getcwd(); chdir($newdirectory) diff --git a/scripts/Dpkg/Source/Package/V3/Git.pm b/scripts/Dpkg/Source/Package/V3/Git.pm index 884129107..b4fbf0629 100644 --- a/scripts/Dpkg/Source/Package/V3/Git.pm +++ b/scripts/Dpkg/Source/Package/V3/Git.pm @@ -53,7 +53,7 @@ sub prerequisites { 'git is not in the PATH')); } -sub _sanity_check { +sub _check_workdir { my $srcdir = shift; if (! -d "$srcdir/.git") { @@ -128,7 +128,7 @@ sub do_build { my ($dirname, $updir) = fileparse($dir); my $basenamerev = $self->get_basename(1); - _sanity_check($dir); + _check_workdir($dir); my $old_cwd = getcwd(); chdir $dir or syserr(g_("unable to chdir to '%s'"), $dir); @@ -265,7 +265,7 @@ sub do_extract { subprocerr('cp') if $?; } - _sanity_check($newdirectory); + _check_workdir($newdirectory); if (defined $fields->{'Vcs-Git'}) { my $remote = 'origin'; -- Dpkg.Org's dpkg
