diff --git a/config/dev-server-config.json b/config/dev-server-config.json index 7c693e1de..82305d3e5 100644 --- a/config/dev-server-config.json +++ b/config/dev-server-config.json @@ -28,7 +28,6 @@ "/sighelper/": { "handler": "jsonsign", "handlerArgs": { - "keyRing": ["_env", "${CAMLI_KEY_RING}"], "secretRing": ["_env", "${CAMLI_SECRET_RING}"], "keyId": "26F5ABDA" } diff --git a/lib/go/camli/blobserver/localdisk/enumerate.go b/lib/go/camli/blobserver/localdisk/enumerate.go index faec6185c..6b5e68e83 100644 --- a/lib/go/camli/blobserver/localdisk/enumerate.go +++ b/lib/go/camli/blobserver/localdisk/enumerate.go @@ -53,6 +53,9 @@ func readBlobs(opts readBlobRequest) os.Error { } defer dir.Close() names, err := dir.Readdirnames(32768) + if err == os.EOF { + return nil + } if err != nil { return &enumerateError{"localdisk: readdirnames of " + dirFullPath, err} }