diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
| commit | a9db7d10b6e4e86fb2b87a4161db3b1f202002fd (patch) | |
| tree | 4a22481ab65447d8bc1cc307a76a884a7e7bbee9 /guix/store.scm | |
| parent | e33d9d6f09874f83bb5a03f49cb969a84588e10e (diff) | |
| parent | 2b6bdf7eb3c95716ac107ea6caea2e0b7077ae77 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/autotools.scm
gnu/packages/guile.scm
gnu/packages/python.scm
gnu/packages/shishi.scm
guix/gnu-maintenance.scm
guix/scripts/build.scm
guix/scripts/gc.scm
guix/scripts/package.scm
guix/scripts/substitute-binary.scm
guix/ui.scm
nix/nix-daemon/guix-daemon.cc
test-env.in
tests/nar.scm
tests/store.scm
Diffstat (limited to 'guix/store.scm')
| -rw-r--r-- | guix/store.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/store.scm b/guix/store.scm index b1b60babf0..b82588b2a0 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -336,7 +336,10 @@ encoding conversion errors." #f)) ((= k %stderr-error) (let ((error (read-latin1-string p)) - (status (if (>= (nix-server-minor-version server) 8) + ;; Currently the daemon fails to send a status code for early + ;; errors like DB schema version mismatches, so check for EOF. + (status (if (and (>= (nix-server-minor-version server) 8) + (not (eof-object? (lookahead-u8 p)))) (read-int p) 1))) (raise (condition (&nix-protocol-error |