commit crmsh for openSUSE:Factory

30 Apr 2024

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2024-04-30 17:27:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and      /work/SRC/openSUSE:Factory/.crmsh.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "crmsh"

Tue Apr 30 17:27:52 2024 rev:332 rq:1170896 version:4.6.0+20240430.641cb15b

Changes:
--------

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes	2024-04-25 20:48:35.616783113 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1880/crmsh.changes	2024-04-30 17:29:30.894873257 +0200
@@ -1,0 +2,14 @@
+Mon Apr 29 23:59:04 UTC 2024 - XLiang@suse.com
+
+- Update to version 4.6.0+20240430.641cb15b:
+  * Fix: main: Set PATH environment first
+  * Dev: bash_completion: Enable complete 'id=' on non-interactive mode
+
+-------------------------------------------------------------------
+Thu Apr 25 08:32:10 UTC 2024 - XLiang@suse.com
+
+- Update to version 4.6.0+20240425.c75d131a:
+  * Doc: regenerate man-4.6
+  * Dev: ui_context: ignore requirements when option --help is specified
+
+-------------------------------------------------------------------

Old:
----
  crmsh-4.6.0+20240424.11e262d0.tar.bz2

New:
----
  crmsh-4.6.0+20240430.641cb15b.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.uxp2aA/_old	2024-04-30 17:29:31.762904823 +0200
+++ /var/tmp/diff_new_pack.uxp2aA/_new	2024-04-30 17:29:31.766904969 +0200
@@ -36,7 +36,7 @@
 Summary:        High Availability cluster command-line interface
 License:        GPL-2.0-or-later
 Group:          %{pkg_group}
-Version:        4.6.0+20240424.11e262d0
+Version:        4.6.0+20240430.641cb15b
 Release:        0
 URL:            http://crmsh.github.io
 Source0:        %{name}-%{version}.tar.bz2

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.uxp2aA/_old	2024-04-30 17:29:31.822907005 +0200
+++ /var/tmp/diff_new_pack.uxp2aA/_new	2024-04-30 17:29:31.826907151 +0200
@@ -9,7 +9,7 @@
 </service>
 <service name="tar_scm">
   <param name="url">https://github.com/ClusterLabs/crmsh.git</param>
-  <param name="changesrevision">11e262d05440b23219eb9365e81d65488e83e080</param>
+  <param name="changesrevision">641cb15b7e93ed74412c833fb6767d2c3530d3b1</param>
 </service>
 </servicedata>
 (No newline at EOF)

++++++ crmsh-4.6.0+20240424.11e262d0.tar.bz2 -> crmsh-4.6.0+20240430.641cb15b.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/contrib/bash_completion.sh new/crmsh-4.6.0+20240430.641cb15b/contrib/bash_completion.sh
--- old/crmsh-4.6.0+20240424.11e262d0/contrib/bash_completion.sh	2024-04-24 11:30:11.000000000 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/contrib/bash_completion.sh	2024-04-30 01:35:26.000000000 +0200
@@ -149,7 +149,7 @@
 	for x in $1; do
 		if [[ "$x" == "$3"* ]]; then
                     if [[ "$x" =~ .*(=|:)$ ]];then
-                        if [[ "$x" =~ ^id=$ ]];then
+                        if [[ "$x" =~ ^id=$ ]] && [ "$x" == "$3" ];then
                             :
                         else
 			    COMPREPLY[i++]="$2$x"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/crmsh/constants.py new/crmsh-4.6.0+20240430.641cb15b/crmsh/constants.py
--- old/crmsh-4.6.0+20240424.11e262d0/crmsh/constants.py	2024-04-24 11:30:11.000000000 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/crmsh/constants.py	2024-04-30 01:35:26.000000000 +0200
@@ -512,5 +512,6 @@
 RSC_ROLE_UNPROMOTED_LEGACY = "Slave"
 PCMK_VERSION_DEFAULT = "2.0.0"
 
-NON_FUNCTIONAL_COMMANDS = ('help', 'cd', 'ls', 'quit', 'up')
+NON_FUNCTIONAL_COMMANDS = {'help', 'cd', 'ls', 'quit', 'up'}
+NON_FUNCTIONAL_OPTIONS = {'--help', '--help-without-redirect'}
 # vim:ts=4:sw=4:et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/crmsh/main.py new/crmsh-4.6.0+20240430.641cb15b/crmsh/main.py
--- old/crmsh-4.6.0+20240424.11e262d0/crmsh/main.py	2024-04-24 11:30:11.000000000 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/crmsh/main.py	2024-04-30 01:35:26.000000000 +0200
@@ -345,10 +345,10 @@
 
 def run():
     try:
+        envsetup()
         if len(sys.argv) >= 2 and sys.argv[1] == '--compgen':
             compgen()
             return 0
-        envsetup()
         userdir.mv_user_files()
 
         ui = ui_root.Root()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/crmsh/ui_context.py new/crmsh-4.6.0+20240430.641cb15b/crmsh/ui_context.py
--- old/crmsh-4.6.0+20240424.11e262d0/crmsh/ui_context.py	2024-04-24 11:30:11.000000000 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/crmsh/ui_context.py	2024-04-30 01:35:26.000000000 +0200
@@ -82,7 +82,8 @@
                     cmd = True
                     break
             if cmd:
-                if self.command_name not in constants.NON_FUNCTIONAL_COMMANDS:
+                if self.command_name not in constants.NON_FUNCTIONAL_COMMANDS\
+                        and all(arg not in constants.NON_FUNCTIONAL_OPTIONS for arg in self.command_args):
                     entry = self.current_level()
                     if 'requires' in dir(entry) and not entry.requires():
                         self.fatal_error("Missing requirements")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/doc/toolchain/bin/adocxt new/crmsh-4.6.0+20240430.641cb15b/doc/toolchain/bin/adocxt
--- old/crmsh-4.6.0+20240424.11e262d0/doc/toolchain/bin/adocxt	2024-04-24 11:30:11.000000000 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/doc/toolchain/bin/adocxt	2024-04-30 01:35:26.000000000 +0200
@@ -13,8 +13,6 @@
 RE_FROM_CODE_OR_SECTION_TITLE=re.compile(r'^(?:\[\[([^,]+),[^,]*,From Code]]$|=)')
 
 TAG_EXCLUDES = {
-    'cmdhelp_node_online',
-    'cmdhelp_node_standby',
     'cmdhelp_root_report',
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/doc/website-v1/man-4.6.adoc new/crmsh-4.6.0+20240430.641cb15b/doc/website-v1/man-4.6.adoc
--- old/crmsh-4.6.0+20240424.11e262d0/doc/website-v1/man-4.6.adoc	2024-04-24 11:30:11.000000000 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/doc/website-v1/man-4.6.adoc	2024-04-30 01:35:26.000000000 +0200
@@ -2479,9 +2479,20 @@
 
 [[cmdhelp_node_online,set node online,From Code]]
 ==== `online`
-See "crm node help online" or "crm node online --help"
+Usage:
+
+ online [--all | <node>... ]
+
+Specify node(s) on which to online node. If no nodes are specified, online node on the local node. If --all is specified, online node on all nodes.
+
+Options:
+
+* `+++-h, --help+++`: Show this help message
+
+* `+++--all+++`: To online node on all nodes
+
+
 
-[[cmdhelp_node_ready,put node into ready mode]]
 ==== `ready`
 
 Set the node's maintenance status to `off`. The node should be
@@ -2523,9 +2534,22 @@
 
 [[cmdhelp_node_standby,put node into standby,From Code]]
 ==== `standby`
-See "crm node help standby" or "crm node standby --help"
+Usage:
+
+ standby [--all | <node>... ] [lifetime]
+
+Specify node(s) on which to standby node. If no nodes are specified, standby node on the local node. If --all is specified, standby node on all nodes.
+
+Additionally, you may specify a lifetime for the standby---if set to "reboot", the node will be back online once it reboots. "forever" will keep the node in standby after reboot. The life time defaults to "forever".
+
+Options:
+
+* `+++-h, --help+++`: Show this help message
+
+* `+++--all+++`: To standby node on all nodes
+
+
 
-[[cmdhelp_node_status-attr,manage status attributes]]
 ==== `status-attr`
 
 Edit node attributes which are in the CIB status section, i.e.,

    

Source-Sync

tags

participants (1)