[Debian-ha-commits] [pcs] 03/05: d/patches: refresh for new version

[Valentin Vidic]

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

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

commit ffd9830fd4486010ec394343ec6e8cd49f91d467
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Mon Nov 27 10:35:58 2017 +0100

    d/patches: refresh for new version
---
 debian/patches/0005-Replace-orderedhash.patch | 3 ++-
 debian/patches/0007-Fix-testsuite.patch       | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0005-Replace-orderedhash.patch b/debian/patches/0005-Replace-orderedhash.patch
index a797b4b..084820d 100644
--- a/debian/patches/0005-Replace-orderedhash.patch
+++ b/debian/patches/0005-Replace-orderedhash.patch
@@ -61,7 +61,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      out_hash['tokens'] = hash_to_ordered_hash(@tokens)
 --- a/pcsd/pcsd-cli.rb
 +++ b/pcsd/pcsd-cli.rb
-@@ -4,14 +4,14 @@
+@@ -4,15 +4,15 @@
  require 'etc'
  require 'json'
  require 'stringio'
@@ -71,6 +71,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  require 'bootstrap.rb'
  require 'pcs.rb'
  require 'auth.rb'
+ require 'remote.rb'
  
  def cli_format_response(status, text=nil, data=nil)
 -  response = OrderedHash.new
diff --git a/debian/patches/0007-Fix-testsuite.patch b/debian/patches/0007-Fix-testsuite.patch
index 0c60be8..c700469 100644
--- a/debian/patches/0007-Fix-testsuite.patch
+++ b/debian/patches/0007-Fix-testsuite.patch
@@ -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
-@@ -1481,7 +1481,7 @@
+@@ -1483,7 +1483,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):
-@@ -1497,7 +1497,7 @@
+@@ -1499,7 +1499,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):
-@@ -1513,7 +1513,7 @@
+@@ -1515,7 +1515,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/
          )
  
  
-@@ -1864,7 +1864,7 @@
+@@ -1866,7 +1866,7 @@
                   }
              ),
              mock.call(

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