From cb9a80e516268f69fb5e666b0ade4de3b3ca0b26 Mon Sep 17 00:00:00 2001
From: Rick Olson <technoweenie@gmail.com>
Date: Fri, 8 Aug 2014 13:38:02 -0600
Subject: [PATCH] Don't cast a *gitmedia.WrappedError to an error

---
 commands/commands.go     |  1 -
 gitmediaclient/client.go | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/commands/commands.go b/commands/commands.go
index 41b4d3c0..fc5f7dcd 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -97,7 +97,6 @@ func handlePanic(err error) string {
 		return ""
 	}
 
-	Debug(err.Error())
 	return logPanic(err, false)
 }
 
diff --git a/gitmediaclient/client.go b/gitmediaclient/client.go
index 498b7868..b4dc06c9 100644
--- a/gitmediaclient/client.go
+++ b/gitmediaclient/client.go
@@ -35,9 +35,9 @@ func Options(filehash string) error {
 		return err
 	}
 
-	_, err = doRequest(req, creds)
-	if err != nil {
-		return err
+	_, wErr := doRequest(req, creds)
+	if wErr != nil {
+		return wErr
 	}
 
 	return nil
@@ -83,9 +83,9 @@ func Put(filehash, filename string, cb gitmedia.CopyCallback) error {
 
 	fmt.Printf("Sending %s\n", filename)
 
-	_, err = doRequest(req, creds)
-	if err != nil {
-		return err
+	_, wErr := doRequest(req, creds)
+	if wErr != nil {
+		return wErr
 	}
 
 	return nil