From 6fb5f7e532bf43ecf02004a4010496e9f98d09bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Mar 2005 18:55:29 +0000 Subject: [PATCH] * Pass `--base32' unless using MD5. --- scripts/download-using-manifests.pl.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index 487efaba06..4dbc2396f7 100644 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -109,7 +109,9 @@ while ($queueFront < scalar @queue) { if (isValidPath($patch->{basePath})) { # !!! this should be cached my ($baseHashAlgo, $baseHash) = parseHash $patch->{baseHash}; - my $hash = `@bindir@/nix-hash --type '$baseHashAlgo' "$patch->{basePath}"`; + my $format = "--base32"; + $format = "" if $baseHashAlgo eq "md5"; + my $hash = `@bindir@/nix-hash --type '$baseHashAlgo' $format "$patch->{basePath}"`; chomp $hash; # print " MY HASH is $hash\n"; if ($hash ne $baseHash) {