From 06fead6041e2c27f93261b8eb0e55ec7b10b53cb Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Mon, 20 Nov 2017 21:39:13 +0000
Subject: [PATCH] Backport fix from master: Declare 'my' instances of 'tools'
 as 'local' in tools/make_disc_trees.pl

---
 debian/changelog         |  1 +
 tools/make_disc_trees.pl | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5812be51..acc5318b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
     + Fix size calculation for EFI image
     + Make tools/update_popcon exit with errors when it fails
     + Make tools/update_popcon deal with https on popcon.d.o
+    + Declare 'my' instances of '$_' as 'local' in tools/make_disc_trees.pl
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index bd225e94..e607ef29 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -919,7 +919,7 @@ sub Packages_dir {
 sub add_Packages_entry {
     my $dir = shift;
     my $arch = shift;
-    my $_ = shift;
+    local $_ = shift;
     my ($p, $file, $section, $pdir, $pkgfile, $gz, $st1, $st2, $size1, $size2);
     my $blocks_added = 0;
     my $old_blocks = 0;
@@ -984,7 +984,7 @@ sub add_Packages_entry {
 sub add_trans_desc_entry {
     my $dir = shift;
     my $arch = shift;
-    my $_ = shift;
+    local $_ = shift;
     my ($p, $file, $section, $idir, $pkgfile, $gz, $st);
     my $size = 0;
     my $blocks_added = 0;
@@ -1050,7 +1050,7 @@ sub add_trans_desc_entry {
 sub add_md5_entry {
     my $dir = shift;
     my $arch = shift;
-    my $_ = shift;
+    local $_ = shift;
     my ($pdir, $file, $md5, $st, $size, $p);
     my $md5file = "$dir/md5sum.txt";
     my $blocks_added = 0;
@@ -1090,7 +1090,7 @@ sub add_md5_entry {
 sub remove_Packages_entry {
     my $dir = shift;
     my $arch = shift;
-    my $_ = shift;
+    local $_ = shift;
     my ($p, $file, $section, $pdir, $pkgfile, $tmp_pkgfile, $match, $gz,
         $st1, $st2, $size1, $size2);
     my $blocks_removed = 0;
@@ -1158,7 +1158,7 @@ sub remove_Packages_entry {
 sub remove_trans_desc_entry {
     my $dir = shift;
     my $arch = shift;
-    my $_ = shift;
+    local $_ = shift;
     my ($p, $file, $section, $idir, $gz, $match, $st);
     my $size = 0;
     my $blocks_added = 0;
@@ -1227,7 +1227,7 @@ sub remove_trans_desc_entry {
 sub remove_md5_entry {
     my $dir = shift;
     my $arch = shift;
-    my $_ = shift;
+    local $_ = shift;
     my $md5file = "$dir/md5sum.txt";
     my $tmp_md5file = "$dir/md5sum.txt.tmp";
     my @fileslist;