[lxc-devel] [lxd/master] Bugfixes

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170629/31a49fbc/attachment.bin>
-------------- next part --------------
From 1030ca30a95167de294b6f236dd6f98c270fd511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 29 Jun 2017 13:00:41 -0400
Subject: [PATCH 1/2] cancel: Fix crash if no canceler is setup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 shared/cancel/canceler.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/cancel/canceler.go b/shared/cancel/canceler.go
index 7e8685197..79f60dbf9 100644
--- a/shared/cancel/canceler.go
+++ b/shared/cancel/canceler.go
@@ -34,7 +34,7 @@ func CancelableDownload(c *Canceler, client *http.Client, req *http.Request) (*h
 		}
 
 		select {
-		case <-c.chCancel:
+		case <-chCancel:
 			if transport, ok := client.Transport.(*http.Transport); ok {
 				transport.CancelRequest(req)
 			}

From a5c78fe94294d398cadc3524a5209cb013ad1277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 29 Jun 2017 13:19:10 -0400
Subject: [PATCH 2/2] Make deprecation warnings visible in godoc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3466

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 client.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client.go b/client.go
index 8353335a0..174540ebe 100644
--- a/client.go
+++ b/client.go
@@ -1,8 +1,7 @@
-package lxd
-
 // DEPRECATED: This package is now deprecated in favor of github.com/lxc/lxd/client
 //
 // This package will be entirely removed from the code tree with LXD 2.16
+package lxd
 
 import (
 	"bytes"