[Debian-ha-commits] [pcs] 03/14: d/patches: refresh for new version
Valentin Vidic
vvidic-guest at moszumanska.debian.org
Sat Oct 14 11:56:43 UTC 2017
This is an automated email from the git hooks/post-receive script.
vvidic-guest pushed a commit to branch master
in repository pcs.
commit cc9ca460de23d13ae2abc5e59637ad53625ee658
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date: Fri Oct 13 08:43:06 2017 +0200
d/patches: refresh for new version
---
.../0001-Remove-Gemlock.file-on-Debian.patch | 12 ++--
debian/patches/0005-Replace-orderedhash.patch | 17 +++--
debian/patches/0006-Fix-corosync-log.patch | 2 +-
debian/patches/0007-Fix-testsuite.patch | 82 +++++++++++-----------
debian/patches/0008-Replace-chkconfig.patch | 32 ++++-----
debian/patches/0009-Fix-python-lxml.patch | 2 +-
debian/patches/0010-Fix-Makefile-dash.patch | 17 -----
debian/patches/series | 1 -
8 files changed, 76 insertions(+), 89 deletions(-)
diff --git a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
index c9cf0a2..d5e4895 100644
--- a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
+++ b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
@@ -22,17 +22,17 @@ index 3140d6f..0000000
- remote: https://rubygems.org/
- remote: https://tojeline.fedorapeople.org/rubygems/
- specs:
-- backports (3.6.8)
+- backports (3.9.1)
- ethon (0.10.1)
-- ffi (1.9.17)
-- json (2.0.3)
-- multi_json (1.12.1)
+- ffi (1.9.18)
+- json (2.1.0)
+- multi_json (1.12.2)
- open4 (1.3.4)
- orderedhash (0.0.6)
- rack (1.6.4)
- rack-protection (1.5.3)
- rack
-- rack-test (0.6.3)
+- rack-test (0.7.0)
- rack (>= 1.0)
- rpam-ruby19 (1.2.1)
- sinatra (1.4.8)
@@ -46,7 +46,7 @@ index 3140d6f..0000000
- rack-test
- sinatra (~> 1.4.0)
- tilt (>= 1.3, < 3)
-- tilt (2.0.6)
+- tilt (2.0.8)
-
-PLATFORMS
- ruby
diff --git a/debian/patches/0005-Replace-orderedhash.patch b/debian/patches/0005-Replace-orderedhash.patch
index 4b70198..a797b4b 100644
--- a/debian/patches/0005-Replace-orderedhash.patch
+++ b/debian/patches/0005-Replace-orderedhash.patch
@@ -41,19 +41,24 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
c_hash['name'] = c.name
c_hash['nodes'] = c.nodes.uniq.sort
out_hash['clusters'] << c_hash
-@@ -226,10 +226,10 @@
+@@ -182,7 +182,7 @@
+ end
+
+ def hash_to_ordered_hash(hash)
+- new_hash = OrderedHash.new
++ new_hash = ActiveSupport::OrderedHash.new
+ hash.keys.sort.each { |key| new_hash[key] = hash[key] }
+ return new_hash
+ end
+@@ -235,7 +235,7 @@
end
def text()
-- tokens_hash = OrderedHash.new
-+ tokens_hash = ActiveSupport::OrderedHash.new
- @tokens.keys.sort.each { |key| tokens_hash[key] = @tokens[key] }
-
- out_hash = OrderedHash.new
+ out_hash = ActiveSupport::OrderedHash.new
out_hash['format_version'] = CURRENT_FORMAT
out_hash['data_version'] = @data_version
- out_hash['tokens'] = tokens_hash
+ out_hash['tokens'] = hash_to_ordered_hash(@tokens)
--- a/pcsd/pcsd-cli.rb
+++ b/pcsd/pcsd-cli.rb
@@ -4,14 +4,14 @@
diff --git a/debian/patches/0006-Fix-corosync-log.patch b/debian/patches/0006-Fix-corosync-log.patch
index e2b0964..346d7ea 100644
--- a/debian/patches/0006-Fix-corosync-log.patch
+++ b/debian/patches/0006-Fix-corosync-log.patch
@@ -5,7 +5,7 @@ Last-Update: 2016-05-20
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/cluster.py
+++ b/pcs/cluster.py
-@@ -847,7 +847,7 @@
+@@ -888,7 +888,7 @@
quorum_section.add_attribute("two_node", "1")
logging_section.add_attribute("to_logfile", "yes")
diff --git a/debian/patches/0007-Fix-testsuite.patch b/debian/patches/0007-Fix-testsuite.patch
index f3f9427..2ced297 100644
--- a/debian/patches/0007-Fix-testsuite.patch
+++ b/debian/patches/0007-Fix-testsuite.patch
@@ -6,7 +6,7 @@ Last-Update: 2016-11-13
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/test_cluster.py
+++ b/pcs/test/test_cluster.py
-@@ -256,7 +256,7 @@
+@@ -258,7 +258,7 @@
logging {
to_logfile: yes
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
"""
-@@ -315,7 +315,7 @@
+@@ -317,7 +317,7 @@
logging {
to_logfile: yes
@@ -24,7 +24,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -458,7 +458,7 @@
+@@ -460,7 +460,7 @@
logging {
to_logfile: yes
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -503,7 +503,7 @@
+@@ -505,7 +505,7 @@
logging {
to_logfile: yes
@@ -42,7 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -566,7 +566,7 @@
+@@ -569,7 +569,7 @@
logging {
to_logfile: yes
@@ -51,7 +51,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -611,7 +611,7 @@
+@@ -614,7 +614,7 @@
logging {
to_logfile: yes
@@ -60,7 +60,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -652,7 +652,7 @@
+@@ -655,7 +655,7 @@
logging {
to_logfile: yes
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -698,7 +698,7 @@
+@@ -701,7 +701,7 @@
logging {
to_logfile: yes
@@ -78,7 +78,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -740,7 +740,7 @@
+@@ -743,7 +743,7 @@
logging {
to_logfile: yes
@@ -87,7 +87,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -775,7 +775,7 @@
+@@ -778,7 +778,7 @@
logging {
to_logfile: yes
@@ -96,7 +96,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -823,7 +823,7 @@
+@@ -826,7 +826,7 @@
logging {
to_logfile: yes
@@ -105,7 +105,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -869,7 +869,7 @@
+@@ -872,7 +872,7 @@
logging {
to_logfile: yes
@@ -114,7 +114,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -910,7 +910,7 @@
+@@ -913,7 +913,7 @@
logging {
to_logfile: yes
@@ -123,7 +123,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -960,7 +960,7 @@
+@@ -963,7 +963,7 @@
logging {
to_logfile: yes
@@ -132,7 +132,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1006,7 +1006,7 @@
+@@ -1009,7 +1009,7 @@
logging {
to_logfile: yes
@@ -141,7 +141,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1408,7 +1408,7 @@
+@@ -1411,7 +1411,7 @@
logging {
to_logfile: yes
@@ -150,7 +150,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1530,7 +1530,7 @@
+@@ -1533,7 +1533,7 @@
logging {
to_logfile: yes
@@ -159,7 +159,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1589,7 +1589,7 @@
+@@ -1592,7 +1592,7 @@
logging {
to_logfile: yes
@@ -168,7 +168,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1648,7 +1648,7 @@
+@@ -1651,7 +1651,7 @@
logging {
to_logfile: yes
@@ -177,7 +177,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1709,7 +1709,7 @@
+@@ -1712,7 +1712,7 @@
logging {
to_logfile: yes
@@ -186,7 +186,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1775,7 +1775,7 @@
+@@ -1778,7 +1778,7 @@
logging {
to_logfile: yes
@@ -195,7 +195,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1840,7 +1840,7 @@
+@@ -1843,7 +1843,7 @@
logging {
to_logfile: yes
@@ -204,7 +204,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1905,7 +1905,7 @@
+@@ -1908,7 +1908,7 @@
logging {
to_logfile: yes
@@ -213,7 +213,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1994,7 +1994,7 @@
+@@ -1997,7 +1997,7 @@
logging {
to_logfile: yes
@@ -222,7 +222,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -2582,7 +2582,7 @@
+@@ -2585,7 +2585,7 @@
logging {
to_logfile: yes
@@ -231,7 +231,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -2820,7 +2820,7 @@
+@@ -2823,7 +2823,7 @@
logging {
to_logfile: yes
@@ -242,7 +242,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
""")
--- a/pcs/test/test_lib_corosync_config_parser.py
+++ b/pcs/test/test_lib_corosync_config_parser.py
-@@ -1020,7 +1020,7 @@
+@@ -1019,7 +1019,7 @@
# Log to a log file. When set to "no", the "logfile" option
# must not be set.
to_logfile: yes
@@ -251,7 +251,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Log to the system log daemon. When in doubt, set to yes.
to_syslog: yes
# Log debug messages (very verbose). When in doubt, leave off.
-@@ -1060,7 +1060,7 @@
+@@ -1059,7 +1059,7 @@
fileline: off
to_stderr: no
to_logfile: yes
@@ -260,7 +260,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
debug: off
timestamp: on
-@@ -1097,7 +1097,7 @@
+@@ -1096,7 +1096,7 @@
fileline: off
to_logfile: yes
to_syslog: yes
@@ -269,7 +269,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
debug: off
timestamp: on
logger_subsys {
-@@ -1155,7 +1155,7 @@
+@@ -1154,7 +1154,7 @@
fileline: off
to_logfile: yes
to_syslog: yes
@@ -280,7 +280,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/test_stonith.py
+++ b/pcs/test/test_stonith.py
-@@ -279,7 +279,7 @@
+@@ -280,7 +280,7 @@
output, returnVal = pcs(
temp_cib,
@@ -289,7 +289,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
ac(output, "")
self.assertEqual(0, returnVal)
-@@ -295,7 +295,7 @@
+@@ -296,7 +296,7 @@
Resource: f3 (class=stonith type=fence_scsi)
Meta Attrs: provides=unfencing
Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -298,7 +298,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Meta Attrs: provides=something
Operations: monitor interval=60s (f4-monitor-interval-60s)
""")
-@@ -328,7 +328,7 @@
+@@ -329,7 +329,7 @@
output, returnVal = pcs(
temp_cib,
@@ -307,7 +307,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
ac(output, "")
self.assertEqual(0, returnVal)
-@@ -347,7 +347,7 @@
+@@ -348,7 +348,7 @@
Attributes: key=abc
Meta Attrs: provides=unfencing
Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -318,7 +318,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
""")
--- a/pcs/test/test_resource.py
+++ b/pcs/test/test_resource.py
-@@ -2521,13 +2521,13 @@
+@@ -2531,13 +2531,13 @@
def testLSBResource(self):
self.assert_pcs_fail(
@@ -334,7 +334,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"Warning: invalid resource option 'foo', there are no options"
" allowed\n"
)
-@@ -2536,7 +2536,7 @@
+@@ -2546,7 +2546,7 @@
"resource show --full",
outdent(
"""\
@@ -343,7 +343,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Attributes: foo=bar
Operations: monitor interval=15 timeout=15 (D2-monitor-interval-15)
"""
-@@ -2559,7 +2559,7 @@
+@@ -2569,7 +2569,7 @@
"resource show --full",
outdent(
"""\
@@ -354,7 +354,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
--- a/pcs/lib/test/test_resource_agent.py
+++ b/pcs/lib/test/test_resource_agent.py
-@@ -1449,7 +1449,7 @@
+@@ -1481,7 +1481,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -363,7 +363,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_failed_to_get_xml(self):
-@@ -1465,7 +1465,7 @@
+@@ -1497,7 +1497,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -372,7 +372,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_invalid_xml(self):
-@@ -1481,7 +1481,7 @@
+@@ -1513,7 +1513,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -381,7 +381,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
-@@ -1832,7 +1832,7 @@
+@@ -1864,7 +1864,7 @@
}
),
mock.call(
diff --git a/debian/patches/0008-Replace-chkconfig.patch b/debian/patches/0008-Replace-chkconfig.patch
index 74d239e..2d583eb 100644
--- a/debian/patches/0008-Replace-chkconfig.patch
+++ b/debian/patches/0008-Replace-chkconfig.patch
@@ -7,7 +7,7 @@ Last-Update: 2016-11-13
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcsd/pcs.rb
+++ b/pcsd/pcs.rb
-@@ -2068,11 +2068,22 @@
+@@ -2094,11 +2094,22 @@
def is_service_enabled?(service)
if ISSYSTEMCTL
cmd = ['systemctl', 'is-enabled', "#{service}.service"]
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
def is_service_running?(service)
-@@ -2087,12 +2098,13 @@
+@@ -2113,12 +2124,13 @@
def is_service_installed?(service)
unless ISSYSTEMCTL
@@ -49,7 +49,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return true
end
}
-@@ -2122,7 +2134,7 @@
+@@ -2148,7 +2160,7 @@
cmd = ['systemctl', 'enable', "#{service}.service"]
else
# fails when the service is not installed
@@ -58,7 +58,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
-@@ -2137,7 +2149,7 @@
+@@ -2163,7 +2175,7 @@
if ISSYSTEMCTL
cmd = ['systemctl', 'disable', "#{service}.service"]
else
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return (retcode == 0)
--- a/pcs/lib/external.py
+++ b/pcs/lib/external.py
-@@ -128,7 +128,7 @@
+@@ -121,7 +121,7 @@
_systemctl, "disable", _get_service_name(service, instance)
])
else:
@@ -78,7 +78,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if retval != 0:
raise DisableServiceError(
service,
-@@ -152,7 +152,7 @@
+@@ -145,7 +145,7 @@
_systemctl, "enable", _get_service_name(service, instance)
])
else:
@@ -87,7 +87,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if retval != 0:
raise EnableServiceError(
service,
-@@ -235,10 +235,17 @@
+@@ -228,10 +228,17 @@
dummy_stdout, dummy_stderr, retval = runner.run(
[_systemctl, "is-enabled", _get_service_name(service, instance)]
)
@@ -108,7 +108,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
def is_service_running(runner, service, instance=None):
-@@ -286,13 +293,13 @@
+@@ -278,13 +285,13 @@
if is_systemctl():
return []
@@ -126,7 +126,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return service_list
--- a/pcs/test/test_lib_external.py
+++ b/pcs/test/test_lib_external.py
-@@ -1320,7 +1320,7 @@
+@@ -1194,7 +1194,7 @@
self.mock_runner, self.service, None
)
self.mock_runner.run.assert_called_once_with(
@@ -135,7 +135,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_not_systemctl_failed(self, mock_is_installed, mock_systemctl):
-@@ -1335,7 +1335,7 @@
+@@ -1209,7 +1209,7 @@
self.mock_runner, self.service, None
)
self.mock_runner.run.assert_called_once_with(
@@ -144,7 +144,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_systemctl_not_installed(
-@@ -1385,7 +1385,7 @@
+@@ -1259,7 +1259,7 @@
self.mock_runner, self.service, instance
)
self.mock_runner.run.assert_called_once_with(
@@ -153,7 +153,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
@mock.patch("pcs.lib.external.is_systemctl")
-@@ -1418,7 +1418,7 @@
+@@ -1292,7 +1292,7 @@
self.mock_runner.run.return_value = ("", "", 0)
lib.enable_service(self.mock_runner, self.service)
self.mock_runner.run.assert_called_once_with(
@@ -162,7 +162,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_not_systemctl_failed(self, mock_systemctl):
-@@ -1429,7 +1429,7 @@
+@@ -1303,7 +1303,7 @@
lambda: lib.enable_service(self.mock_runner, self.service)
)
self.mock_runner.run.assert_called_once_with(
@@ -171,7 +171,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_instance_systemctl(self, mock_systemctl):
-@@ -1447,7 +1447,7 @@
+@@ -1321,7 +1321,7 @@
self.mock_runner.run.return_value = ("", "", 0)
lib.enable_service(self.mock_runner, self.service, instance="test")
self.mock_runner.run.assert_called_once_with(
@@ -180,7 +180,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
-@@ -1656,18 +1656,18 @@
+@@ -1530,18 +1530,18 @@
def test_not_systemctl_enabled(self, mock_systemctl):
mock_systemctl.return_value = False
@@ -203,7 +203,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
-@@ -1852,24 +1852,23 @@
+@@ -1726,24 +1726,23 @@
mock_is_systemctl.return_value = False
self.mock_runner.run.return_value = (outdent(
"""\
diff --git a/debian/patches/0009-Fix-python-lxml.patch b/debian/patches/0009-Fix-python-lxml.patch
index 5cb11c4..82c237c 100644
--- a/debian/patches/0009-Fix-python-lxml.patch
+++ b/debian/patches/0009-Fix-python-lxml.patch
@@ -7,7 +7,7 @@ Last-Update: 2017-01-06
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/tools/assertions.py
+++ b/pcs/test/tools/assertions.py
-@@ -23,7 +23,7 @@
+@@ -39,7 +39,7 @@
"""
msg = "Start tag expected, '<' not found, line 1, column 1"
if LXML_VERSION >= (3, 7, 0, 0):
diff --git a/debian/patches/0010-Fix-Makefile-dash.patch b/debian/patches/0010-Fix-Makefile-dash.patch
deleted file mode 100644
index a5363d2..0000000
--- a/debian/patches/0010-Fix-Makefile-dash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Update Makefile to work with dash
- echo -e does not work in dash, use printf instead
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Last-Update: 2017-07-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile
-+++ b/Makefile
-@@ -100,7 +100,7 @@
-
- install:
- # make Python interpreter execution sane (via -Es flags)
-- echo -e "[build]\nexecutable = $(PYTHON) -Es\n" > setup.cfg
-+ printf "[build]\nexecutable = $(PYTHON) -Es\n" > setup.cfg
- $(PYTHON) setup.py install --root=$(or ${DESTDIR}, /) ${EXTRA_SETUP_OPTS}
- # fix excessive script interpreting "executable" quoting with old setuptools:
- # https://github.com/pypa/setuptools/issues/188
diff --git a/debian/patches/series b/debian/patches/series
index e73de26..e4e2ad8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
0007-Fix-testsuite.patch
0008-Replace-chkconfig.patch
0009-Fix-python-lxml.patch
-0010-Fix-Makefile-dash.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list