download.pl: properly cleanup intermediate .hash file
authorPetr Štetiar <ynezz@true.cz>
Fri, 27 Nov 2020 20:56:30 +0000 (21:56 +0100)
committerPetr Štetiar <ynezz@true.cz>
Sat, 5 Dec 2020 19:50:19 +0000 (20:50 +0100)
It seems like after a build the /dl dir seems to now contain a .hash
file for each source file due to inproper cleanup so fix it by removing
those intermediate files before leaving the download action.

Fixes: 4e19cbc55335 ("download: handle possibly invalid local tarballs")
Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 52a5d0d27f2557db99fc5435fbd7783b649cb9b2)

scripts/download.pl

index c1623bf91fe01b3096a710e72f3167bd9e242163..2876ae5807cd5611cf1d94591d506feba2c4dfc0 100755 (executable)
@@ -273,11 +273,11 @@ if (-f "$target/$filename") {
                $sum =~ /^(\w+)\s*/ or die "Could not generate file hash\n";
                $sum = $1;
 
+               cleanup();
                exit 0 if $sum eq $file_hash;
 
                die "Hash of the local file $filename does not match (file: $sum, requested: $file_hash) - deleting download.\n";
                unlink "$target/$filename";
-               cleanup();
        };
 }