systemd support for debian/rules

nathanaelle · Jan 8, 2016 · 2390024 · 2390024
1 parent 94bd79e
commit 2390024
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/debian/rules b/debian/rules
@@ -19,4 +19,4 @@ override_dh_auto_install:
 override_dh_auto_test:
 
 %:
-	dh $@ --buildsystem=golang --with=golang
+	dh $@ --buildsystem=golang --with=golang --with=systemd
diff --git a/src/socket.go b/src/socket.go
@@ -103,7 +103,7 @@ func (conn *Conn) Read(b []byte) (n int, err error) {
 				return n,nil
 			}
 
-			if nerr,ok := err.(net.Error); !ok || !nerr.Timeout() {
+			if nerr,ok := err.(net.Error); !ok || !(nerr.Timeout() && nerr.Temporary()) {
 				return
 			}
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ func (conn *Conn) Read(b []byte) (n int, err error) { @@
     				return n,nil
     			}
-    			if nerr,ok := err.(net.Error); !ok || !nerr.Timeout() {
+    			if nerr,ok := err.(net.Error); !ok || !(nerr.Timeout() && nerr.Temporary()) {
     				return
     			}
     		}
@@ Expand Down @@