Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport fix from master: Declare 'my' instances of 'tools' as 'local' in tools/make_disc_trees.pl

This commit is contained in:
Steve McIntyre 2017-11-20 21:39:13 +00:00
parent ff82631d6f
commit 06fead6041
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -28,6 +28,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
+ Fix size calculation for EFI image + Fix size calculation for EFI image
+ Make tools/update_popcon exit with errors when it fails + Make tools/update_popcon exit with errors when it fails
+ Make tools/update_popcon deal with https on popcon.d.o + 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 -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100

12
tools/make_disc_trees.pl
View File

@ -919,7 +919,7 @@ sub Packages_dir {
sub add_Packages_entry { sub add_Packages_entry {
my $dir = shift; my $dir = shift;
my $arch = shift; my $arch = shift;
my $_ = shift; local $_ = shift;
my ($p, $file, $section, $pdir, $pkgfile, $gz, $st1, $st2, $size1, $size2); my ($p, $file, $section, $pdir, $pkgfile, $gz, $st1, $st2, $size1, $size2);
my $blocks_added = 0; my $blocks_added = 0;
my $old_blocks = 0; my $old_blocks = 0;
@ -984,7 +984,7 @@ sub add_Packages_entry {
sub add_trans_desc_entry { sub add_trans_desc_entry {
my $dir = shift; my $dir = shift;
my $arch = shift; my $arch = shift;
my $_ = shift; local $_ = shift;
my ($p, $file, $section, $idir, $pkgfile, $gz, $st); my ($p, $file, $section, $idir, $pkgfile, $gz, $st);
my $size = 0; my $size = 0;
my $blocks_added = 0; my $blocks_added = 0;
@ -1050,7 +1050,7 @@ sub add_trans_desc_entry {
sub add_md5_entry { sub add_md5_entry {
my $dir = shift; my $dir = shift;
my $arch = shift; my $arch = shift;
my $_ = shift; local $_ = shift;
my ($pdir, $file, $md5, $st, $size, $p); my ($pdir, $file, $md5, $st, $size, $p);
my $md5file = "$dir/md5sum.txt"; my $md5file = "$dir/md5sum.txt";
my $blocks_added = 0; my $blocks_added = 0;
@ -1090,7 +1090,7 @@ sub add_md5_entry {
sub remove_Packages_entry { sub remove_Packages_entry {
my $dir = shift; my $dir = shift;
my $arch = shift; my $arch = shift;
my $_ = shift; local $_ = shift;
my ($p, $file, $section, $pdir, $pkgfile, $tmp_pkgfile, $match, $gz, my ($p, $file, $section, $pdir, $pkgfile, $tmp_pkgfile, $match, $gz,
$st1, $st2, $size1, $size2); $st1, $st2, $size1, $size2);
my $blocks_removed = 0; my $blocks_removed = 0;
@ -1158,7 +1158,7 @@ sub remove_Packages_entry {
sub remove_trans_desc_entry { sub remove_trans_desc_entry {
my $dir = shift; my $dir = shift;
my $arch = shift; my $arch = shift;
my $_ = shift; local $_ = shift;
my ($p, $file, $section, $idir, $gz, $match, $st); my ($p, $file, $section, $idir, $gz, $match, $st);
my $size = 0; my $size = 0;
my $blocks_added = 0; my $blocks_added = 0;
@ -1227,7 +1227,7 @@ sub remove_trans_desc_entry {
sub remove_md5_entry { sub remove_md5_entry {
my $dir = shift; my $dir = shift;
my $arch = shift; my $arch = shift;
my $_ = shift; local $_ = shift;
my $md5file = "$dir/md5sum.txt"; my $md5file = "$dir/md5sum.txt";
my $tmp_md5file = "$dir/md5sum.txt.tmp"; my $tmp_md5file = "$dir/md5sum.txt.tmp";
my @fileslist; my @fileslist;