From cdee3174190c237bbf36955a5faa3896f564b7a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Dec 2008 17:02:29 +0000 Subject: [PATCH] * Backwards compatibility. --- src/nix-worker/nix-worker.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc index c956f839e..fd34bea67 100644 --- a/src/nix-worker/nix-worker.cc +++ b/src/nix-worker/nix-worker.cc @@ -288,12 +288,17 @@ static void performOp(unsigned int clientVersion, } case wopAddToStore: { - /* !!! uberquick hack */ string baseName = readString(from); - readInt(from); /* obsolete; was `fixed' flag */ + bool fixed = readInt(from) == 1; /* obsolete */ bool recursive = readInt(from) == 1; - HashType hashAlgo = parseHashType(readString(from)); - + string s = readString(from); + /* Compatibility hack. */ + if (!fixed) { + s = "sha256"; + recursive = true; + } + HashType hashAlgo = parseHashType(s); + Path tmp = createTempDir(); AutoDelete delTmp(tmp); Path tmp2 = tmp + "/" + baseName;