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=1f74a0244273a549159fb6d3742176af1e5c6cd7 commit 1f74a0244273a549159fb6d3742176af1e5c6cd7 Author: Guillem Jover <guil...@debian.org> AuthorDate: Mon Aug 25 12:25:25 2025 +0200 Dpkg::Source: Rename $tmp to $tmpdir Use a way less generic name for the temporary directory variables. --- scripts/Dpkg/Source/Archive.pm | 25 +++++++++++++------------ scripts/Dpkg/Source/Package/V2.pm | 18 +++++++++--------- scripts/Dpkg/Source/Package/V3/Bzr.pm | 10 +++++----- scripts/Dpkg/Source/Package/V3/Git.pm | 12 ++++++------ 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm index f3cf47fda..d39d8874e 100644 --- a/scripts/Dpkg/Source/Archive.pm +++ b/scripts/Dpkg/Source/Archive.pm @@ -134,8 +134,8 @@ sub extract { # Kludge so that realpath works mkdir($dest) or syserr(g_('cannot create directory %s'), $dest); } - my $tmp = tempdir($template, DIR => Cwd::realpath("$dest/.."), CLEANUP => 1); - $spawn_opts{chdir} = $tmp; + my $tmpdir = tempdir($template, DIR => Cwd::realpath("$dest/.."), CLEANUP => 1); + $spawn_opts{chdir} = $tmpdir; # Prepare stuff that handles the input of tar $self->ensure_open('r', delete_sig => [ 'PIPE' ]); @@ -158,7 +158,7 @@ sub extract { # extracted); we need --no-same-owner because putting the owner # back is tedious - in particular, correct group ownership would # have to be calculated using mount options and other madness. - fixperms($tmp) unless $opts{no_fixperms}; + fixperms($tmpdir) unless $opts{no_fixperms}; # If we are extracting "in-place" do not remove the destination directory. if ($opts{in_place}) { @@ -181,7 +181,7 @@ sub extract { }; my $move_in_place = sub { - my $relpath = File::Spec->abs2rel($File::Find::name, $tmp); + my $relpath = File::Spec->abs2rel($File::Find::name, $tmpdir); my $destpath = File::Spec->catfile($dest, $relpath); my ($mode, $atime, $mtime); @@ -231,25 +231,26 @@ sub extract { wanted => $move_in_place, no_chdir => 1, dangling_symlinks => 0, - }, $tmp); + }, $tmpdir); } else { # Rename extracted directory - opendir(my $dir_dh, $tmp) or syserr(g_('cannot opendir %s'), $tmp); + opendir my $dir_dh, $tmpdir + or syserr(g_('cannot opendir %s'), $tmpdir); my @entries = grep { $_ ne '.' && $_ ne '..' } readdir($dir_dh); closedir($dir_dh); erasedir($dest); - if (scalar(@entries) == 1 && ! -l "$tmp/$entries[0]" && -d _) { - rename("$tmp/$entries[0]", $dest) + if (scalar(@entries) == 1 && ! -l "$tmpdir/$entries[0]" && -d _) { + rename "$tmpdir/$entries[0]", $dest or syserr(g_('unable to rename %s to %s'), - "$tmp/$entries[0]", $dest); + "$tmpdir/$entries[0]", $dest); } else { - rename($tmp, $dest) - or syserr(g_('unable to rename %s to %s'), $tmp, $dest); + rename $tmpdir, $dest + or syserr(g_('unable to rename %s to %s'), $tmpdir, $dest); } } - erasedir($tmp); + erasedir($tmpdir); } =head1 CHANGES diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index 0130446ad..f36b75507 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -470,28 +470,28 @@ sub _generate_patch { } # Unpack a second copy for comparison - my $tmp = tempdir("$dirname.orig.XXXXXX", DIR => $updir); - push_exit_handler(sub { erasedir($tmp) }); + my $tmpdir = tempdir("$dirname.orig.XXXXXX", DIR => $updir); + push_exit_handler(sub { erasedir($tmpdir) }); # Extract main tarball my $tar = Dpkg::Source::Archive->new(filename => $tarfile); - $tar->extract($tmp); + $tar->extract($tmpdir); # Extract additional orig tarballs foreach my $subdir (keys %addonfile) { my $file = $addonfile{$subdir}; $tar = Dpkg::Source::Archive->new(filename => $file); - $tar->extract("$tmp/$subdir"); + $tar->extract("$tmpdir/$subdir"); } # Copy over the debian directory - erasedir("$tmp/debian"); - system('cp', '-RPp', '--', "$dir/debian", "$tmp/"); + erasedir("$tmpdir/debian"); + system('cp', '-RPp', '--', "$dir/debian", "$tmpdir/"); subprocerr(g_('copy of the debian directory')) if $?; # Apply all patches except the last automatic one $opts{skip_auto} //= 0; - $self->apply_patches($tmp, skip_auto => $opts{skip_auto}, usage => 'build'); + $self->apply_patches($tmpdir, skip_auto => $opts{skip_auto}, usage => 'build'); # Create a patch my ($difffh, $tmpdiff) = tempfile($self->get_basename(1) . '.diff.XXXXXX', @@ -510,7 +510,7 @@ sub _generate_patch { return $self->_get_patch_header($dir); } }); - $diff->add_diff_directory($tmp, $dir, basedirname => $basedirname, + $diff->add_diff_directory($tmpdir, $dir, basedirname => $basedirname, %{$self->{diff_options}}, handle_binary_func => $opts{handle_binary}, order_from => $opts{order_from}); @@ -525,7 +525,7 @@ sub _generate_patch { } # Remove the temporary directory - erasedir($tmp); + erasedir($tmpdir); pop_exit_handler(); pop_exit_handler(); diff --git a/scripts/Dpkg/Source/Package/V3/Bzr.pm b/scripts/Dpkg/Source/Package/V3/Bzr.pm index 94703d567..d5e33e7d8 100644 --- a/scripts/Dpkg/Source/Package/V3/Bzr.pm +++ b/scripts/Dpkg/Source/Package/V3/Bzr.pm @@ -138,9 +138,9 @@ sub do_build { chdir $old_cwd or syserr(g_("unable to chdir to '%s'"), $old_cwd); - my $tmp = tempdir("$dirname.bzr.XXXXXX", DIR => $updir); - push_exit_handler(sub { erasedir($tmp) }); - my $tardir = "$tmp/$dirname"; + my $tmpdir = tempdir("$dirname.bzr.XXXXXX", DIR => $updir); + push_exit_handler(sub { erasedir($tmpdir) }); + my $tardir = "$tmpdir/$dirname"; system('bzr', 'branch', $dir, $tardir); subprocerr("bzr branch $dir $tardir") if $?; @@ -160,11 +160,11 @@ sub do_build { my $tar = Dpkg::Source::Archive->new(filename => $debianfile, compression => $self->{options}{compression}, compression_level => $self->{options}{comp_level}); - $tar->create(chdir => $tmp); + $tar->create(chdir => $tmpdir); $tar->add_directory($dirname); $tar->finish(); - erasedir($tmp); + erasedir($tmpdir); pop_exit_handler(); $self->add_file($debianfile); diff --git a/scripts/Dpkg/Source/Package/V3/Git.pm b/scripts/Dpkg/Source/Package/V3/Git.pm index c5977f1e7..0a9fd661d 100644 --- a/scripts/Dpkg/Source/Package/V3/Git.pm +++ b/scripts/Dpkg/Source/Package/V3/Git.pm @@ -187,13 +187,13 @@ sub do_build { # If a depth was specified, need to create a shallow clone and # bundle that. - my $tmp; + my $tmpdir; my $shallowfile; if ($self->{options}{git_depth}) { chdir $old_cwd or syserr(g_("unable to chdir to '%s'"), $old_cwd); - $tmp = tempdir("$dirname.git.XXXXXX", DIR => $updir); - push_exit_handler(sub { erasedir($tmp) }); - my $clone_dir = "$tmp/repo.git"; + $tmpdir = tempdir("$dirname.git.XXXXXX", DIR => $updir); + push_exit_handler(sub { erasedir($tmpdir) }); + my $clone_dir = "$tmpdir/repo.git"; # file:// is needed to avoid local cloning, which does not # create a shallow clone. info(g_('creating shallow clone with depth %s'), @@ -222,8 +222,8 @@ sub do_build { chdir $old_cwd or syserr(g_("unable to chdir to '%s'"), $old_cwd); - if (defined $tmp) { - erasedir($tmp); + if (defined $tmpdir) { + erasedir($tmpdir); pop_exit_handler(); } -- Dpkg.Org's dpkg
