From d251a9b367d715c50e023e0220d8e3a61058029a Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 19 Jan 2015 14:28:28 -0800 Subject: [PATCH] localdisk: skip the 'packed' directory in enumerate, like 'cache' Change-Id: I33bb39921d466a0c476c23d9da436273845c6628 --- pkg/blobserver/localdisk/enumerate.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/blobserver/localdisk/enumerate.go b/pkg/blobserver/localdisk/enumerate.go index 86e47c2c7..2536ea6ff 100644 --- a/pkg/blobserver/localdisk/enumerate.go +++ b/pkg/blobserver/localdisk/enumerate.go @@ -184,12 +184,10 @@ func (ds *DiskStorage) EnumerateBlobs(ctx *context.Context, dest chan<- blob.Siz func skipDir(name string) bool { // The partition directory is old. (removed from codebase, but - // likely still on disk for some people) - // the "cache" directory is just a hack: it's used - // by the serverconfig/genconfig code, as a default - // location for most users to put their thumbnail - // cache. For now we just also skip it here. - return name == "partition" || name == "cache" + // likely still on disk for some people) the "cache" and + // "packed" directories are used by the serverconfig/genconfig + // code, as a default location for most users. + return name == "partition" || name == "cache" || name == "packed" } func isShardDir(name string) bool {