[Debian-ha-commits] [fence-agents] 04/04: Drop patches merged upstream

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository fence-agents.

commit 2f2d0dbfb12a47d39f47155e2b8194e2c6bd0cd1
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Feb 16 10:59:44 2018 +0100

    Drop patches merged upstream
---
 debian/patches/python3 | 26 --------------------------
 debian/patches/series  |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/python3 b/debian/patches/python3
deleted file mode 100644
index 58b2a18..0000000
--- a/debian/patches/python3
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Make sure all agents use and work with python3
- Small fixes for agents to use python3 and have correct syntax
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Bug: https://github.com/ClusterLabs/fence-agents/pull/170
-Last-Update: 2018-02-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/fence/agents/heuristics_ping/fence_heuristics_ping.py
-+++ b/fence/agents/heuristics_ping/fence_heuristics_ping.py
-@@ -72,7 +72,7 @@
- 			p[target].wait()
- 			if p[target].returncode == 0:
- 				for line in p[target].stdout:
--					searchres = packet_count.search(line)
-+					searchres = packet_count.search(line.decode())
- 					if searchres:
- 						good = int(searchres.group(1))
- 						break
---- a/fence/agents/powerman/fence_powerman.py
-+++ b/fence/agents/powerman/fence_powerman.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!@PYTHON@ -tt
- import os
- import time
- from datetime import datetime
diff --git a/debian/patches/series b/debian/patches/series
index 112386f..dec0462 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 remove-fence_amt_ws
 disable-network-access
-python3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/fence-agents.git