From f9848d4f3122b8a43b69d53277b606806bdba9dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Apr 2005 14:33:32 +0000 Subject: [PATCH] * Support base-32 hash representations. --- src/nix-store/main.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc index a8720ce6f..6de26dabc 100644 --- a/src/nix-store/main.cc +++ b/src/nix-store/main.cc @@ -132,9 +132,13 @@ static void opPrintFixedPath(Strings opFlags, Strings opArgs) string hash = *i++; string name = *i++; + HashType ht(parseHashType(hashAlgo)); + Hash h = hash.size() == Hash(ht).hashSize * 2 + ? parseHash(ht, hash) + : parseHash32(ht, hash); + cout << format("%1%\n") % - makeFixedOutputPath(recursive, hashAlgo, - parseHash(parseHashType(hashAlgo), hash), name); + makeFixedOutputPath(recursive, hashAlgo, h, name); }