Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2015-09-24 06:15:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-09-13 09:45:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-09-24 06:16:08.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 22 09:15:19 UTC 2015 - [email protected] + +- Update to version 2.2.0~rc3+git.1442913222.4ba506b: + + high: config: Remove config.core.supported_schemas (bsc#946893) + +------------------------------------------------------------------- Old: ---- crmsh-2.2.0~rc3+git.1441965248.a9a616d.tar.bz2 New: ---- crmsh-2.2.0~rc3+git.1442913222.4ba506b.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.wX4tE2/_old 2015-09-24 06:16:09.000000000 +0200 +++ /var/tmp/diff_new_pack.wX4tE2/_new 2015-09-24 06:16:09.000000000 +0200 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0~rc3+git.1441965248.a9a616d +Version: 2.2.0~rc3+git.1442913222.4ba506b Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.wX4tE2/_old 2015-09-24 06:16:09.000000000 +0200 +++ /var/tmp/diff_new_pack.wX4tE2/_new 2015-09-24 06:16:09.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">a9a616da75689af2b80f39d530e99e8aa855da64</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">4ba506b414b9b5a6d6024880a6a1538b2d307968</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0~rc3+git.1441965248.a9a616d.tar.bz2 -> crmsh-2.2.0~rc3+git.1442913222.4ba506b.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/crm.conf.in new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/crm.conf.in --- old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/crm.conf.in 2015-09-11 12:21:55.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/crm.conf.in 2015-09-22 11:15:18.000000000 +0200 @@ -17,7 +17,6 @@ ; ptest = ptest, crm_simulate ; dotty = dotty ; dot = dot -; supported_schemas = 1.0, 1.1, 1.2, 1.3, 2.0, 2.1, 2.2, next ; ignore_missing_metadata = no ; report_tool_options = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/config.py new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/config.py --- old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/config.py 2015-09-11 12:21:55.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/config.py 2015-09-22 11:15:18.000000000 +0200 @@ -15,7 +15,6 @@ _SYSTEMWIDE = '/etc/crm/crm.conf' _PERUSER = os.getenv("CRM_CONFIG_FILE") or os.path.join(userdir.CONFIG_HOME, 'crm.conf') -_SUPPORTED_SCHEMAS = ('1.0', '1.1', '1.2', '1.3', '2.0', '2.1', '2.2', '2.3', 'next') _PATHLIST = { 'datadir': ('/usr/share', '/usr/local/share', '/opt'), @@ -205,7 +204,6 @@ 'ptest': opt_program('', ('ptest', 'crm_simulate')), 'dotty': opt_program('', ('dotty',)), 'dot': opt_program('', ('dot',)), - 'supported_schemas': opt_list(_SUPPORTED_SCHEMAS), 'ignore_missing_metadata': opt_boolean('no'), 'report_tool_options': opt_string('') }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/msg.py new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/msg.py --- old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/msg.py 2015-09-11 12:21:55.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/msg.py 2015-09-22 11:15:18.000000000 +0200 @@ -241,9 +241,6 @@ err_buf.error("Unsupported CIB: validator '%s', release '%s'" % (validator, rel)) err_buf.error("To upgrade an old (<1.0) schema, use the upgrade command.") - err_buf.error("Edit the core.supported_schemas option to add schemas manually.") - schemas = config.core.supported_schemas - err_buf.error("core.supported_schemas: %s" % (', '.join(schemas))) def update_err(obj_id, cibadm_opt, xml, rc): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/schema.py new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/schema.py --- old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/schema.py 2015-09-11 12:21:55.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/schema.py 2015-09-22 11:15:18.000000000 +0200 @@ -12,17 +12,16 @@ Check if the given name is a supported schema name A short form is also accepted where the prefix pacemaker- is implied. + + Revision: The pacemaker schema version now + changes too often for a strict check to make sense. + Lets just check look for schemas we know we don't + support. """ - shortform = re.compile(r'^(\d+\.\d+)|next$') - slist = config.core.supported_schemas - for s in slist: - if s == name: - return True - elif shortform.match(s) and 'pacemaker-' + s == name: - return True - elif shortform.match(name) and 'pacemaker-' + name == s: - return True - return False + name = re.match(r'pacemaker-(\d+\.\d+)$', name) + if name: + return float(name.group(1)) > 0.9 + return True def get_attrs(schema, name): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/utils.py new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/utils.py --- old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/modules/utils.py 2015-09-11 12:21:55.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/utils.py 2015-09-22 11:15:18.000000000 +0200 @@ -373,13 +373,6 @@ return True -def is_value_sane(name): - if re.search("[']", name): - common_err("%s: bad value" % name) - return False - return True - - def show_dot_graph(dotfile, keep_file=False, desc="transition graph"): cmd = "%s %s" % (config.core.dotty, dotfile) if not keep_file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/test/unittests/test_cliformat.py new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/test/unittests/test_cliformat.py --- old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/test/unittests/test_cliformat.py 2015-09-11 12:21:55.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/test/unittests/test_cliformat.py 2015-09-22 11:15:18.000000000 +0200 @@ -248,3 +248,13 @@ @with_setup(setup_func, teardown_func) def test_topology_1114(): roundtrip('fencing_topology attr:rack=1 node1,node2') + + +@with_setup(setup_func, teardown_func) +def test_is_value_sane(): + roundtrip('''primitive p1 dummy params state="bo'o"''') + + +@with_setup(setup_func, teardown_func) +def test_is_value_sane_2(): + roundtrip('primitive p1 dummy params state="bo\\"o"') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/test/unittests/test_utils.py new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/test/unittests/test_utils.py --- old/crmsh-2.2.0~rc3+git.1441965248.a9a616d/test/unittests/test_utils.py 2015-09-11 12:21:55.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/test/unittests/test_utils.py 2015-09-22 11:15:18.000000000 +0200 @@ -98,10 +98,8 @@ insane_names = ["f'o"] for n in sane_names: assert utils.is_name_sane(n) - assert utils.is_value_sane(n) for n in insane_names: assert not utils.is_name_sane(n) - assert not utils.is_value_sane(n) def test_nvpairs2dict():
