Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2017-11-10 14:57:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Fri Nov 10 14:57:51 2017 rev:131 rq:540211 version:4.0.0+git.1510233955.43c72bf7 Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-11-03 16:29:04.286992413 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-11-10 14:58:03.854630965 +0100 @@ -1,0 +2,8 @@ +Thu Nov 09 13:28:04 UTC 2017 - kgronlund@suse.com + +- Update to version 4.0.0+git.1510233955.43c72bf7: + * high: bootstrap: Fix readline error in cluster remove (bsc#1067424) + * low: bootstrap: Clarify removal warning + * low: bootstrap: Avoid printing None instead of NTP service name + +------------------------------------------------------------------- Old: ---- crmsh-4.0.0+git.1509626995.fa880522.tar.bz2 New: ---- crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.226NpE/_old 2017-11-10 14:58:04.958591033 +0100 +++ /var/tmp/diff_new_pack.226NpE/_new 2017-11-10 14:58:04.962590889 +0100 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 4.0.0+git.1509626995.fa880522 +Version: 4.0.0+git.1510233955.43c72bf7 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.226NpE/_old 2017-11-10 14:58:05.022588718 +0100 +++ /var/tmp/diff_new_pack.226NpE/_new 2017-11-10 14:58:05.026588573 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">fa88052261c4fa3d34e1df358fbf9cfdabd33ed9</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">43c72bf7f33b941ba68e41d612741591e0d7fa92</param></service></servicedata> \ No newline at end of file ++++++ crmsh-4.0.0+git.1509626995.fa880522.tar.bz2 -> crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/bootstrap.py new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py --- old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/bootstrap.py 2017-11-02 13:49:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py 2017-11-09 14:25:55.000000000 +0100 @@ -119,6 +119,12 @@ die("Can't append to {} - aborting".format(LOG_FILE)) +def drop_last_history(): + hlen = readline.get_current_history_length() + if hlen > 0: + readline.remove_history_item(hlen - 1) + + def prompt_for_string(msg, match=None, default='', valid_func=None, prev_value=None): if _context.yes_to_all: return default @@ -129,7 +135,7 @@ if not val: val = default else: - readline.remove_history_item(readline.get_current_history_length()-1) + drop_last_history() if match is None: return val if re.match(match, val) is not None: @@ -144,7 +150,7 @@ disable_completion() rc = utils.ask(msg) enable_completion() - readline.remove_history_item(readline.get_current_history_length()-1) + drop_last_history() return rc @@ -378,7 +384,10 @@ timekeeper = tk break - if not service_is_enabled(timekeeper): + if timekeeper is None: + warn("No NTP service found.") + warned = True + elif not service_is_enabled(timekeeper): warn("{} is not configured to start at system boot.".format(timekeeper)) warned = True @@ -2069,7 +2078,7 @@ init() remove_ssh() - if not confirm("Do you want to remove node \"{}\" anyway?".format(cluster_node)): + if not force and not confirm("Removing node \"{}\" from the cluster: Are you sure?".format(cluster_node)): return if remove_localhost_check(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/ui_cluster.py new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/ui_cluster.py --- old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/ui_cluster.py 2017-11-02 13:49:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/ui_cluster.py 2017-11-09 14:25:55.000000000 +0100 @@ -394,15 +394,12 @@ return True @command.skill_level('administrator') - def do_rename(self, context, *args): + def do_rename(self, context, new_name): ''' Rename the cluster. ''' if not bootstrap.service_is_active("corosync.service"): context.fatal_error("Can't rename cluster when cluster service is stopped") - if len(args) != 1: - context.fatal_error("Expected <clustername>") - new_name = args[0] old_name = cib_factory.get_property('cluster-name') if old_name and new_name == old_name: context.fatal_error("Expected a different name")