From b5bccf22614379365b01e5d03efa1af188616fe1 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sat, 21 Apr 2012 08:29:32 -0700
Subject: [PATCH] localdisk: fix double slash in full path, preventing race
 lock from working

Change-Id: I171099214b06ec99d0ad766d1604442879fb3183
---
 pkg/blobserver/localdisk/enumerate.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/blobserver/localdisk/enumerate.go b/pkg/blobserver/localdisk/enumerate.go
index ff81c4737..7f35f8ed2 100644
--- a/pkg/blobserver/localdisk/enumerate.go
+++ b/pkg/blobserver/localdisk/enumerate.go
@@ -48,7 +48,7 @@ func (ee *enumerateError) Error() string {
 }
 
 func readBlobs(opts readBlobRequest) error {
-	dirFullPath := opts.dirRoot + "/" + opts.pathInto
+	dirFullPath := filepath.Join(opts.dirRoot, opts.pathInto)
 	dir, err := os.Open(dirFullPath)
 	if err != nil {
 		return &enumerateError{"localdisk: opening directory " + dirFullPath, err}