From 0e9921e6f3363b24c2d37cdfc349c19efbe68267 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sat, 21 May 2011 08:51:49 -0700
Subject: [PATCH] Update to get dev-server working again after jsonsign & Go
 changes.

---
 config/dev-server-config.json                  | 1 -
 lib/go/camli/blobserver/localdisk/enumerate.go | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

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}
 	}