[buildd-tools-devel] Bug#836175: libsbuild-perl: Do not use single quotes in embedded perl script

[Samuel Thibault]

Control: tags -1 + patch

Hello,

Just to make the issue clear, here is the patch I used.

Samuel
-------------- next part --------------
--- ./lib/Sbuild/ResolverBase.pm.orig	2016-08-31 11:20:56.381290583 +0200
+++ ./lib/Sbuild/ResolverBase.pm	2016-08-31 11:21:03.961296415 +0200
@@ -1370,12 +1370,12 @@
 	my ($filename, @args) = @_;
 
 	open(my $saved_stdout, ">&STDOUT") or die "cannot save stdout: $!";
-	open(my $packages, '>', $filename) or die "cannot open Packages for writing: $!";
-	open(STDOUT, '>&', $packages) or die "cannot redirect stdout: $!";
+	open(my $packages, ">", $filename) or die "cannot open Packages for writing: $!";
+	open(STDOUT, ">&", $packages) or die "cannot redirect stdout: $!";
 
 	system(@args) == 0 or die "system @args failed: $?";
 
-	open(STDOUT, '>&', $saved_stdout) or die "cannot restore stdout: $!";
+	open(STDOUT, ">&", $saved_stdout) or die "cannot restore stdout: $!";
 	close $saved_stdout;
 	close $packages;
 }
@@ -1383,37 +1383,37 @@
 sub hash_file($$)
 {
 	my ($filename, $hashobj) = @_;
-	open (my $handle, '<', $filename) or die "cannot open $filename for reading: $!";
+	open (my $handle, "<", $filename) or die "cannot open $filename for reading: $!";
 	my $hash = $hashobj->addfile($handle)->hexdigest;
 	close $handle;
 	return $hash;
 }
 
-system_redir_stdout('Packages', 'dpkg-scanpackages', '.', '/dev/null');
-system_redir_stdout('Sources', 'dpkg-scansources', '.', '/dev/null');
+system_redir_stdout("Packages", "dpkg-scanpackages", ".", "/dev/null");
+system_redir_stdout("Sources", "dpkg-scansources", ".", "/dev/null");
 
-gzip 'Packages' => 'Packages.gz' or die "gzip failed: $GzipError\n";
-gzip 'Sources' => 'Sources.gz' or die "gzip failed: $GzipError\n";
+gzip "Packages" => "Packages.gz" or die "gzip failed: $GzipError\n";
+gzip "Sources" => "Sources.gz" or die "gzip failed: $GzipError\n";
 
-my $packages_md5 = hash_file('Packages', Digest::MD5->new);
-my $sources_md5 = hash_file('Sources', Digest::MD5->new);
-my $packagesgz_md5 = hash_file('Packages.gz', Digest::MD5->new);
-my $sourcesgz_md5 = hash_file('Sources.gz', Digest::MD5->new);
-
-my $packages_sha1 = hash_file('Packages', Digest::SHA->new(1));
-my $sources_sha1 = hash_file('Sources', Digest::SHA->new(1));
-my $packagesgz_sha1 = hash_file('Packages.gz', Digest::SHA->new(1));
-my $sourcesgz_sha1 = hash_file('Sources.gz', Digest::SHA->new(1));
-
-my $packages_sha256 = hash_file('Packages', Digest::SHA->new(256));
-my $sources_sha256 = hash_file('Sources', Digest::SHA->new(256));
-my $packagesgz_sha256 = hash_file('Packages.gz', Digest::SHA->new(256));
-my $sourcesgz_sha256 = hash_file('Sources.gz', Digest::SHA->new(256));
-
-my $packages_size = -s 'Packages';
-my $sources_size = -s 'Sources';
-my $packagesgz_size = -s 'Packages.gz';
-my $sourcesgz_size = -s 'Sources.gz';
+my $packages_md5 = hash_file("Packages", Digest::MD5->new);
+my $sources_md5 = hash_file("Sources", Digest::MD5->new);
+my $packagesgz_md5 = hash_file("Packages.gz", Digest::MD5->new);
+my $sourcesgz_md5 = hash_file("Sources.gz", Digest::MD5->new);
+
+my $packages_sha1 = hash_file("Packages", Digest::SHA->new(1));
+my $sources_sha1 = hash_file("Sources", Digest::SHA->new(1));
+my $packagesgz_sha1 = hash_file("Packages.gz", Digest::SHA->new(1));
+my $sourcesgz_sha1 = hash_file("Sources.gz", Digest::SHA->new(1));
+
+my $packages_sha256 = hash_file("Packages", Digest::SHA->new(256));
+my $sources_sha256 = hash_file("Sources", Digest::SHA->new(256));
+my $packagesgz_sha256 = hash_file("Packages.gz", Digest::SHA->new(256));
+my $sourcesgz_sha256 = hash_file("Sources.gz", Digest::SHA->new(256));
+
+my $packages_size = -s "Packages";
+my $sources_size = -s "Sources";
+my $packagesgz_size = -s "Packages.gz";
+my $sourcesgz_size = -s "Sources.gz";
 
 # The timestamp format of release files is documented here:
 #   https://wiki.debian.org/RepositoryFormat#Date.2CValid-Until
@@ -1427,7 +1427,7 @@
 my $datestring = strftime "%a, %d %b %Y %H:%M:%S +0000", gmtime();
 setlocale(LC_TIME, $old_locale);
 
-open(my $releasefh, '>', 'Release') or die "cannot open Release for writing: $!";
+open(my $releasefh, ">", "Release") or die "cannot open Release for writing: $!";
 
 print $releasefh <<"END";
 Codename: invalid