From 594328e21ceaeeb941b96905f63313badfdbe571 Mon Sep 17 00:00:00 2001
From: Andrew Gerrand <adg@golang.org>
Date: Sat, 5 Jul 2014 08:25:28 +1000
Subject: [PATCH] serverconfig: only add importer when index available

Change-Id: I1142afd0bfa1cf581641b4cd4dac1c9e76e6671a
---
 pkg/serverinit/genconfig.go                 | 8 +++++---
 pkg/serverinit/testdata/justblobs-want.json | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkg/serverinit/genconfig.go b/pkg/serverinit/genconfig.go
index 3912ad85a..e06f270fe 100644
--- a/pkg/serverinit/genconfig.go
+++ b/pkg/serverinit/genconfig.go
@@ -435,9 +435,11 @@ func genLowLevelPrefixes(params *configPrefixesParams, ownerName string) (m json
 		"handler": "status",
 	}
 	importerArgs := map[string]interface{}{}
-	m["/importer/"] = map[string]interface{}{
-		"handler":     "importer",
-		"handlerArgs": importerArgs,
+	if haveIndex {
+		m["/importer/"] = map[string]interface{}{
+			"handler":     "importer",
+			"handlerArgs": importerArgs,
+		}
 	}
 
 	if params.shareHandlerPath != "" {
diff --git a/pkg/serverinit/testdata/justblobs-want.json b/pkg/serverinit/testdata/justblobs-want.json
index 5b788fea4..c5f0c625b 100644
--- a/pkg/serverinit/testdata/justblobs-want.json
+++ b/pkg/serverinit/testdata/justblobs-want.json
@@ -23,10 +23,6 @@
 				"path": "/tmp/blobs/cache"
 			}
 		},
-		"/importer/": {
-			"handler": "importer",
-			"handlerArgs": {}
-		},
 		"/setup/": {
 			"handler": "setup"
 		},