wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 23:11:16 +02:00
Code Activity

Add a Store::addToStore() variant that accepts a NAR

Browse source 
As a side effect, this ensures that signatures are propagated when
copying paths between stores.

Also refactored import/export to make use of this.
This commit is contained in:
Eelco Dolstra 2016-05-04 13:36:54 +02:00
parent b6c768fb6a
commit 538a64e8c3
15 changed files with 235 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libutil/compression.cc
View file

@ -173,26 +173,26 @@ static ref<std::string> decompressBzip2(const std::string & in)
}
}
ref<std::string> compress(const std::string & method, ref<std::string> in)
ref<std::string> compress(const std::string & method, const std::string & in)
{
if (method == "none")
return in;
return make_ref<std::string>(in);
else if (method == "xz")
return compressXZ(*in);
return compressXZ(in);
else if (method == "bzip2")
return compressBzip2(*in);
return compressBzip2(in);
else
throw UnknownCompressionMethod(format("unknown compression method ‘%s’") % method);
}
ref<std::string> decompress(const std::string & method, ref<std::string> in)
ref<std::string> decompress(const std::string & method, const std::string & in)
{
if (method == "none")
return in;
return make_ref<std::string>(in);
else if (method == "xz")
return decompressXZ(*in);
return decompressXZ(in);
else if (method == "bzip2")
return decompressBzip2(*in);
return decompressBzip2(in);
else
throw UnknownCompressionMethod(format("unknown compression method ‘%s’") % method);
}