diff -Nru docker.io-1.7.0+15610+6a18412/api/client/help.go docker.io-1.7.0+15614+29595fd/api/client/help.go
--- docker.io-1.7.0+15610+6a18412/api/client/help.go	2015-05-18 22:22:41.000000000 +0000
+++ docker.io-1.7.0+15614+29595fd/api/client/help.go	2015-05-19 14:57:52.000000000 +0000
@@ -23,10 +23,9 @@
 		method, exists := cli.getMethod(args[0])
 		if !exists {
 			return fmt.Errorf("docker: '%s' is not a docker command. See 'docker --help'.", args[0])
-		} else {
-			method("--help")
-			return nil
 		}
+		method("--help")
+		return nil
 	}
 
 	flag.Usage()
diff -Nru docker.io-1.7.0+15610+6a18412/daemon/networkdriver/bridge/driver.go docker.io-1.7.0+15614+29595fd/daemon/networkdriver/bridge/driver.go
--- docker.io-1.7.0+15610+6a18412/daemon/networkdriver/bridge/driver.go	2015-05-18 22:22:41.000000000 +0000
+++ docker.io-1.7.0+15614+29595fd/daemon/networkdriver/bridge/driver.go	2015-05-19 14:57:52.000000000 +0000
@@ -307,11 +307,11 @@
 		}
 	}
 
-	if gateway, err := requestDefaultGateway(config.DefaultGatewayIPv4, bridgeIPv4Network); err != nil {
+	gateway, err := requestDefaultGateway(config.DefaultGatewayIPv4, bridgeIPv4Network)
+	if err != nil {
 		return err
-	} else {
-		gatewayIPv4 = gateway
 	}
+	gatewayIPv4 = gateway
 
 	if config.FixedCIDRv6 != "" {
 		_, subnet, err := net.ParseCIDR(config.FixedCIDRv6)
@@ -325,11 +325,11 @@
 		}
 		globalIPv6Network = subnet
 
-		if gateway, err := requestDefaultGateway(config.DefaultGatewayIPv6, globalIPv6Network); err != nil {
+		gateway, err := requestDefaultGateway(config.DefaultGatewayIPv6, globalIPv6Network)
+		if err != nil {
 			return err
-		} else {
-			gatewayIPv6 = gateway
 		}
+		gatewayIPv6 = gateway
 	}
 
 	// Block BridgeIP in IP allocator
diff -Nru docker.io-1.7.0+15610+6a18412/debian/changelog docker.io-1.7.0+15614+29595fd/debian/changelog
--- docker.io-1.7.0+15610+6a18412/debian/changelog	2015-05-18 23:23:53.000000000 +0000
+++ docker.io-1.7.0+15614+29595fd/debian/changelog	2015-05-19 15:26:13.000000000 +0000
@@ -1,8 +1,8 @@
-docker.io (1.7.0+15610+6a18412-3~trusty1) trusty; urgency=low
+docker.io (1.7.0+15614+29595fd-3~trusty1) trusty; urgency=low
 
   * Automated rebuild.
 
- -- Tianon Gravi <admwiggin@gmail.com>  Mon, 18 May 2015 23:23:53 +0000
+ -- Tianon Gravi <admwiggin@gmail.com>  Tue, 19 May 2015 15:26:13 +0000
 
 docker.io (1.6.1+dfsg1-2) unstable; urgency=medium
 
diff -Nru docker.io-1.7.0+15610+6a18412/pkg/ioutils/readers_test.go docker.io-1.7.0+15614+29595fd/pkg/ioutils/readers_test.go
--- docker.io-1.7.0+15610+6a18412/pkg/ioutils/readers_test.go	2015-05-18 22:22:41.000000000 +0000
+++ docker.io-1.7.0+15614+29595fd/pkg/ioutils/readers_test.go	2015-05-19 14:57:52.000000000 +0000
@@ -43,10 +43,9 @@
 }
 
 func TestReaderErrWrapperRead(t *testing.T) {
-	called := false
 	reader := strings.NewReader("a string reader.")
 	wrapper := NewReaderErrWrapper(reader, func() {
-		called = true // Should not be called
+		t.Fatalf("readErrWrapper should not have called the anonymous function on failure")
 	})
 	// Read 20 byte (should be ok with the string above)
 	num, err := wrapper.Read(make([]byte, 20))
diff -Nru docker.io-1.7.0+15610+6a18412/pkg/units/duration.go docker.io-1.7.0+15614+29595fd/pkg/units/duration.go
--- docker.io-1.7.0+15610+6a18412/pkg/units/duration.go	2015-05-18 22:22:41.000000000 +0000
+++ docker.io-1.7.0+15614+29595fd/pkg/units/duration.go	2015-05-19 14:57:52.000000000 +0000
@@ -26,7 +26,6 @@
 		return fmt.Sprintf("%d weeks", hours/24/7)
 	} else if hours < 24*365*2 {
 		return fmt.Sprintf("%d months", hours/24/30)
-	} else {
-		return fmt.Sprintf("%d years", hours/24/365)
 	}
+	return fmt.Sprintf("%d years", int(d.Hours())/24/365)
 }