From 6f2f84996d239531cd32a4bebbea208153466a20 Mon Sep 17 00:00:00 2001
From: Richard Scothern <richard.scothern@gmail.com>
Date: Tue, 14 Jul 2015 11:14:09 -0700
Subject: [PATCH] Fix build when using build tag 'noresumabledigest'

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
---
 docs/storage/blobwriter.go           | 33 ++++++++++++++++++++++++++++
 docs/storage/blobwriter_resumable.go | 32 ---------------------------
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/docs/storage/blobwriter.go b/docs/storage/blobwriter.go
index 6a37e81dd..4189d5178 100644
--- a/docs/storage/blobwriter.go
+++ b/docs/storage/blobwriter.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"path"
 	"time"
 
 	"github.com/Sirupsen/logrus"
@@ -311,3 +312,35 @@ func (bw *blobWriter) moveBlob(ctx context.Context, desc distribution.Descriptor
 
 	return bw.blobStore.driver.Move(ctx, bw.path, blobPath)
 }
+
+// removeResources should clean up all resources associated with the upload
+// instance. An error will be returned if the clean up cannot proceed. If the
+// resources are already not present, no error will be returned.
+func (bw *blobWriter) removeResources(ctx context.Context) error {
+	dataPath, err := bw.blobStore.pm.path(uploadDataPathSpec{
+		name: bw.blobStore.repository.Name(),
+		id:   bw.id,
+	})
+
+	if err != nil {
+		return err
+	}
+
+	// Resolve and delete the containing directory, which should include any
+	// upload related files.
+	dirPath := path.Dir(dataPath)
+	if err := bw.blobStore.driver.Delete(ctx, dirPath); err != nil {
+		switch err := err.(type) {
+		case storagedriver.PathNotFoundError:
+			break // already gone!
+		default:
+			// This should be uncommon enough such that returning an error
+			// should be okay. At this point, the upload should be mostly
+			// complete, but perhaps the backend became unaccessible.
+			context.GetLogger(ctx).Errorf("unable to delete layer upload resources %q: %v", dirPath, err)
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/docs/storage/blobwriter_resumable.go b/docs/storage/blobwriter_resumable.go
index af8478881..c2ab21239 100644
--- a/docs/storage/blobwriter_resumable.go
+++ b/docs/storage/blobwriter_resumable.go
@@ -100,38 +100,6 @@ func (bw *blobWriter) resumeDigestAt(ctx context.Context, offset int64) error {
 	return nil
 }
 
-// removeResources should clean up all resources associated with the upload
-// instance. An error will be returned if the clean up cannot proceed. If the
-// resources are already not present, no error will be returned.
-func (bw *blobWriter) removeResources(ctx context.Context) error {
-	dataPath, err := bw.blobStore.pm.path(uploadDataPathSpec{
-		name: bw.blobStore.repository.Name(),
-		id:   bw.id,
-	})
-
-	if err != nil {
-		return err
-	}
-
-	// Resolve and delete the containing directory, which should include any
-	// upload related files.
-	dirPath := path.Dir(dataPath)
-	if err := bw.blobStore.driver.Delete(ctx, dirPath); err != nil {
-		switch err := err.(type) {
-		case storagedriver.PathNotFoundError:
-			break // already gone!
-		default:
-			// This should be uncommon enough such that returning an error
-			// should be okay. At this point, the upload should be mostly
-			// complete, but perhaps the backend became unaccessible.
-			context.GetLogger(ctx).Errorf("unable to delete layer upload resources %q: %v", dirPath, err)
-			return err
-		}
-	}
-
-	return nil
-}
-
 type hashStateEntry struct {
 	offset int64
 	path   string