systemd support for debian/rules

nathanaelle · nathanaelle · commit 23900249bcd7 · 2016-01-08T23:55:41.000+01:00
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 number	Diff line change
`@@ -103,7 +103,7 @@ func (conn *Conn) Read(b []byte) (n int, err error) {`
`103`	`103`	`return n,nil`
`104`	`104`	`}`
`105`	`105`
`106`		`- if nerr,ok := err.(net.Error); !ok \|\| !nerr.Timeout() {`
	`106`	`+ if nerr,ok := err.(net.Error); !ok \|\| !(nerr.Timeout() && nerr.Temporary()) {`
`107`	`107`	`return`
`108`	`108`	`}`
`109`	`109`	`}`