Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-02-25 22:09:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-02-22
08:58:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-02-26
00:28:27.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Feb 24 11:00:06 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1456299101.87fe3c9:
+ + high: ui_configure: Fix commit force (#120)
+ + medium: config: make multiarch dependency a dynamic include (#119)
+ + low: ui_node: Less cryptic query when fencing node
+
+-------------------------------------------------------------------
Old:
----
crmsh-2.2.0+git.1455627181.78fd949.tar.bz2
New:
----
crmsh-2.2.0+git.1456299101.87fe3c9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.P8gk1d/_old 2016-02-26 00:28:28.000000000 +0100
+++ /var/tmp/diff_new_pack.P8gk1d/_new 2016-02-26 00:28:28.000000000 +0100
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0+
Group: %{pkg_group}
-Version: 2.2.0+git.1455627181.78fd949
+Version: 2.2.0+git.1456299101.87fe3c9
Release: 0
Url: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.P8gk1d/_old 2016-02-26 00:28:28.000000000 +0100
+++ /var/tmp/diff_new_pack.P8gk1d/_new 2016-02-26 00:28:28.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">78fd94936f0edc2c9c040b72757aaed024621bc9</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">87fe3c9e0a7bf7ff8ed28d7bd116957326e9f02e</param></service></servicedata>
\ No newline at end of file
++++++ crmsh-2.2.0+git.1455627181.78fd949.tar.bz2 ->
crmsh-2.2.0+git.1456299101.87fe3c9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1455627181.78fd949/AUTHORS
new/crmsh-2.2.0+git.1456299101.87fe3c9/AUTHORS
--- old/crmsh-2.2.0+git.1455627181.78fd949/AUTHORS 2016-02-19
09:59:06.000000000 +0100
+++ new/crmsh-2.2.0+git.1456299101.87fe3c9/AUTHORS 2016-02-24
12:00:06.000000000 +0100
@@ -7,12 +7,14 @@
Andrew Beekhof <andrew[at]beekhof[dot]net>
Borislav Borisov <borislav[dot]v[dot]borisov[at]gmail[dot]com>
Christian Seiler <christian[at]iwakd[dot]de>
+ Daniel Hoffend <dh[at]dotlan[dot]net>
Dejan Muhamedagic <dejan[at]suse[dot]de>
Federica Teodori <federica[dot]teodori[at]googlemail[dot]com>
Florian Haas <florian[dot]haas[at]linbit[dot]com>
Goldwyn Rodrigues <rgoldwyn[at]novell[dot]com>
Hideo Yamauchi <renayama19661014[at]ybb[dot]ne[dot]jp>
Holger Teutsch <holger[dot]teutsch[at]web[dot]de>
+ Kai Kang <kai[dot]kang[at]windriver[dot]com>
Kazunori INOUE <kazunori[dot]inoue3[at]gmail[dot]com>
Keisuke MORI <keisuke[dot]mori+ha[at]gmail[dot]com>
Kristoffer Gronlund <kgronlund[at]suse[dot]com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1455627181.78fd949/modules/config.py
new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/config.py
--- old/crmsh-2.2.0+git.1455627181.78fd949/modules/config.py 2016-02-19
09:59:06.000000000 +0100
+++ new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/config.py 2016-02-24
12:00:06.000000000 +0100
@@ -13,14 +13,31 @@
from . import userdir
+def configure_libdir():
+ '''
+ sysconfig is only available in 2.7 and above
+ MULTIARCH is a debian specific configuration variable
+ '''
+ dirs = ('/usr/lib64', '/usr/libexec', '/usr/lib',
+ '/usr/local/lib64', '/usr/local/libexec', '/usr/local/lib')
+ try:
+ import sysconfig
+ multiarch = sysconfig.get_config_var('MULTIARCH')
+ if multiarch:
+ dirs += ('/usr/lib/%s' % multiarch,
+ '/usr/local/lib/%s' % multiarch)
+ except ImportError:
+ pass
+ return dirs
+
+
_SYSTEMWIDE = '/etc/crm/crm.conf'
_PERUSER = os.getenv("CRM_CONFIG_FILE") or os.path.join(userdir.CONFIG_HOME,
'crm.conf')
_PATHLIST = {
'datadir': ('/usr/share', '/usr/local/share', '/opt'),
'cachedir': ('/var/cache', '/opt/cache'),
- 'libdir': ('/usr/lib64', '/usr/libexec', '/usr/lib',
- '/usr/local/lib64', '/usr/local/libexec', '/usr/local/lib'),
+ 'libdir': configure_libdir(),
'varlib': ('/var/lib', '/opt/var/lib'),
'wwwdir': ('/srv/www', '/var/www')
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1455627181.78fd949/modules/ui_configure.py
new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/ui_configure.py
--- old/crmsh-2.2.0+git.1455627181.78fd949/modules/ui_configure.py
2016-02-19 09:59:06.000000000 +0100
+++ new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/ui_configure.py
2016-02-24 12:00:06.000000000 +0100
@@ -606,9 +606,6 @@
return ui_utils.ptestlike(set_obj.ptest, 'vv',
context.get_command_name(), args)
def _commit(self, force=False, replace=False):
- if force:
- syntax_err(('configure.commit', force))
- return False
if not cib_factory.has_cib_changed():
common_info("apparently there is nothing to commit")
common_info("try changing something first")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1455627181.78fd949/modules/ui_node.py
new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/ui_node.py
--- old/crmsh-2.2.0+git.1455627181.78fd949/modules/ui_node.py 2016-02-19
09:59:06.000000000 +0100
+++ new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/ui_node.py 2016-02-24
12:00:06.000000000 +0100
@@ -213,7 +213,7 @@
if not utils.is_name_sane(node):
return False
if not config.core.force and \
- not utils.ask("Do you really want to shoot %s?" % node):
+ not utils.ask("Fencing %s will shut down the node and migrate
any resources that are running on it! Do you want to fence %s?" % node):
return False
return utils.ext_cmd(self.node_fence % (node)) == 0
