amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.

Browse source
This commit is contained in:
Ludovic Courtès 2015-01-04 23:27:34 +01:00
parent 828c0bec6b
commit 15ddeff532
10 changed files with 133 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/libutil/archive.cc
View file

@ -104,7 +104,7 @@ static void dump(const Path & path, Sink & sink, PathFilter & filter)
writeString(readLink(path), sink);
}
else throw Error(format("file `%1%' has an unknown type") % path);
else throw Error(format("file `%1%' has an unsupported type") % path);
writeString(")", sink);
}

2
nix/libutil/util.cc
View file

@ -1041,7 +1041,7 @@ void expect(std::istream & str, const string & s)
char s2[s.size()];
str.read(s2, s.size());
if (string(s2, s.size()) != s)
throw Error(format("expected string `%1%'") % s);
throw FormatError(format("expected string `%1%'") % s);
}

2
nix/libutil/util.hh
View file

@ -326,6 +326,8 @@ bool hasSuffix(const string & s, const string & suffix);
/* Read string `s' from stream `str'. */
void expect(std::istream & str, const string & s);
MakeError(FormatError, Error)
/* Read a C-style string from stream `str'. */
string parseString(std::istream & str);