[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/files/
Date: Sat, 20 Mar 2021 17:38:41 +0000 (UTC)	[thread overview]
Message-ID: <1616242089.fcea218dfc8edb841e460bc0737ac9ef7de7d89d.andrewammerlaan@gentoo> (raw)

commit:     fcea218dfc8edb841e460bc0737ac9ef7de7d89d
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sat Mar 20 12:08:09 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Mar 20 12:08:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fcea218d

sys-cluster/pcs-0.10.8: fix openrc patch

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.8.patch | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch
index ad73352f..4cd3915e 100644
--- a/sys-cluster/pcs/files/openrc-0.10.8.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.8.patch
@@ -1,6 +1,6 @@
-diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
---- pcs-0.10.7/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.7-openrc/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
+diff -uPNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-openrc/pcs/lib/external.py
+--- pcs-0.10.8/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
++++ pcs-0.10.8-openrc/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
 @@ -13,8 +13,8 @@
  from pcs.lib.errors import LibraryError
  
@@ -82,9 +82,9 @@ diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
      if return_code != 0:
          return []
  
-diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py
---- pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
+diff -uPNr pcs-0.10.8/pcs/settings_default.py pcs-0.10.8-openrc/pcs/settings_default.py
+--- pcs-0.10.8/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
++++ pcs-0.10.8-openrc/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +114,9 @@ diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_def
  # this limit is also mentioned in docs, change there as well
  sbd_max_device_num = 3
  # message types are also mentioned in docs, change there as well
-diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.debian
---- pcs-0.10.7/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.7-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
+diff -uPNr pcs-0.10.8/pcs/settings.py.debian pcs-0.10.8-openrc/pcs/settings.py.debian
+--- pcs-0.10.8/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
++++ pcs-0.10.8-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +133,9 @@ diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.d
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
---- pcs-0.10.7/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
+diff -uPNr pcs-0.10.8/pcs/utils.py pcs-0.10.8-openrc/pcs/utils.py
+--- pcs-0.10.8/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
++++ pcs-0.10.8-openrc/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +154,9 @@ diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
---- pcs-0.10.7/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
-+++ pcs-0.10.7-openrc/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
+diff -uPNr pcs-0.10.8/pcsd/pcs.rb pcs-0.10.8-openrc/pcsd/pcs.rb
+--- pcs-0.10.8/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
++++ pcs-0.10.8-openrc/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -238,9 +238,9 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
---- pcs-0.10.7/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.7-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
+diff -uPNr pcs-0.10.8/pcsd/settings.rb pcs-0.10.8-openrc/pcsd/settings.rb
+--- pcs-0.10.8/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
++++ pcs-0.10.8-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -250,9 +250,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb.debian
---- pcs-0.10.7/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.7-openrc/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
+diff -uPNr pcs-0.10.8/pcsd/settings.rb.debian pcs-0.10.8-openrc/pcsd/settings.rb.debian
+--- pcs-0.10.8/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
++++ pcs-0.10.8-openrc/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -262,9 +262,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py
---- pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
-+++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
+diff -uPNr pcs-0.10.8/pcs_test/tier0/lib/test_external.py pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py
+--- pcs-0.10.8/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
++++ pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib

next             reply	other threads:[~2021-03-20 17:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-20 17:38 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-04-09  3:30 [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/files/ Ronny Gutbrod
2021-04-21  7:32 Andrew Ammerlaan
2021-04-12  5:38 Theo Anderson
2020-12-17 16:59 Andrew Ammerlaan
2020-12-17 16:59 Andrew Ammerlaan
2020-12-16 13:12 Andrew Ammerlaan
2020-12-16 13:12 Andrew Ammerlaan
2020-12-06 18:44 Andrew Ammerlaan

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ad73352 dfblob:4cd3915 )
 OR (
bs:"[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1616242089.fcea218dfc8edb841e460bc0737ac9ef7de7d89d.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox