[Debian-ha-commits] [pacemaker] 01/01: Updated patches 0019 and 0020 to better resolve their respective issues

[Richard Winters]

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

devrik-guest pushed a commit to branch master
in repository pacemaker.

commit d6e640b00f2835e569f6e932ff304b5ea65626cb
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu May 7 20:50:38 2015 -0400

    Updated patches 0019 and 0020 to better resolve their respective issues
    
     - Escaping the '-n' shows a forward slash in the --help
       output of each binary effected by the patches, so the
       output was changed to replace '[options]' from the output
       to '[additional options]' and then subsequently replace
       '-n' with '[options]'
    
    Change-Id: I7e99f9e7d76df58039b2562702b9f11868419ebf
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 .../0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch | 7 ++++---
 .../0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch b/debian/patches/0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch
index 39a6928..9785af4 100644
--- a/debian/patches/0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch
+++ b/debian/patches/0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch
@@ -2,7 +2,8 @@ From: Richard B Winters <rik at mmogp.com>
 Date: Wed, 29 Apr 2015 19:07:32 -0400
 Subject: Fixed hyphen-used-as-minus-sign in crm_attribute 8
 
- - Escaped '-n' in tools/crm_atrribute.c
+ - Replaced '-n' with '[options]' and the original '[options]' 
+   with '[additional options]' in tools/crm_atrribute.c
 
 Change-Id: Ic283c973604cf93d1f8f1cc0ea4fcefac43942f0
 Signed-off-by: Richard B Winters <rik at mmogp.com>
@@ -11,7 +12,7 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/crm_attribute.c b/tools/crm_attribute.c
-index 60d39b6..a9b42e3 100644
+index 60d39b6..3b4ce1d 100644
 --- a/tools/crm_attribute.c
 +++ b/tools/crm_attribute.c
 @@ -125,7 +125,7 @@ main(int argc, char **argv)
@@ -19,7 +20,7 @@ index 60d39b6..a9b42e3 100644
  
      crm_log_cli_init("crm_attribute");
 -    crm_set_options(NULL, "command -n attribute [options]", long_options,
-+    crm_set_options(NULL, "command \\-n attribute [options]", long_options,
++    crm_set_options(NULL, "command [options] attribute [additional options]", long_options,
                      "Manage node's attributes and cluster options."
                      "\n\nAllows node attributes and cluster options to be queried, modified and deleted.\n");
  
diff --git a/debian/patches/0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch b/debian/patches/0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch
index a39da27..78a8a8d 100644
--- a/debian/patches/0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch
+++ b/debian/patches/0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch
@@ -2,7 +2,9 @@ From: Richard B Winters <rik at mmogp.com>
 Date: Wed, 29 Apr 2015 19:11:46 -0400
 Subject: Fixed hyphen-used-as-minus-sign in attrd_updater 8
 
- - Escaped '-n' in tools/attrd_updater.c
+ - Updated [options] in tools/attrd_updater.c to read: 
+   [additional options]
+ - Replaced '-n' in tools/attrd_updater.c with [options]
 
 Change-Id: Iad70fffe5d4bbf2d24f2dd809130d0b6cc46bf9d
 Signed-off-by: Richard B Winters <rik at mmogp.com>
@@ -11,7 +13,7 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/attrd_updater.c b/tools/attrd_updater.c
-index 54b2c60..f5be46f 100644
+index 54b2c60..1f67ae0 100644
 --- a/tools/attrd_updater.c
 +++ b/tools/attrd_updater.c
 @@ -75,7 +75,7 @@ main(int argc, char **argv)
@@ -19,7 +21,7 @@ index 54b2c60..f5be46f 100644
  
      crm_log_cli_init("attrd_updater");
 -    crm_set_options(NULL, "command -n attribute [options]", long_options,
-+    crm_set_options(NULL, "command \\-n attribute [options]", long_options,
++    crm_set_options(NULL, "command [options] attribute [additional options]", long_options,
                      "Tool for updating cluster node attributes");
  
      if (argc < 2) {

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