commit crmsh for openSUSE:Factory

2016-01-21 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2016-01-21 23:43:52

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-12-09 
22:14:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-01-22 
01:09:21.0 +0100
@@ -1,0 +2,19 @@
+Fri Jan 15 16:13:32 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1452874360.0988ac4:
+  + Release 2.2.0
+  + low: don't use deprecated crm_attribute -U option
+  + high: cibconfig: Fix XML import bug for cloned groups (bsc#959895)
+  + medium: ui_cib: Call crm_shadow in batch mode to avoid spawning subshell 
(bsc#961392)
+  + high: cibconfig: fail if new object already exists (bsc#959965)
+  + high: cibconfig: Preserve failure through edit (bsc#959965)
+  + low: hb_report: Drop function from event patterns
+  + medium: ui_history: Add events command (bsc#952449)
+  + medium: scripts: Reformat scripts to simplified form
+  + medium: scripts: Load single file yml scripts
+  + low: clidisplay: Avoid crash when colorizing None
+  + medium: cibconfig: Detect false container children
+  + medium: history: Ignore central log
+  + medium: history: Fix live report refresh (bsc#950422) (bsc#927414)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2

New:

  crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.siH12D/_old  2016-01-22 01:09:24.0 +0100
+++ /var/tmp/diff_new_pack.siH12D/_new  2016-01-22 01:09:24.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package crmsh
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc3+git.1449475283.649c9d2
+Version:2.2.0+git.1452874360.0988ac4
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2
@@ -196,8 +196,7 @@
 %defattr(-,root,root)
 
 %{_sbindir}/crm
-%{python_sitelib}/crmsh
-%{python_sitelib}/crmsh*.egg-info
+%{python_sitelib}/crmsh*
 
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/tests

++ _service ++
--- /var/tmp/diff_new_pack.siH12D/_old  2016-01-22 01:09:24.0 +0100
+++ /var/tmp/diff_new_pack.siH12D/_new  2016-01-22 01:09:24.0 +0100
@@ -3,7 +3,7 @@
 git://github.com/ClusterLabs/crmsh.git
 git
 crmsh
-2.2.0~rc3+git.%ct.%h
+2.2.0+git.%ct.%h
 master
 enable
   

++ _servicedata ++
--- /var/tmp/diff_new_pack.siH12D/_old  2016-01-22 01:09:24.0 +0100
+++ /var/tmp/diff_new_pack.siH12D/_new  2016-01-22 01:09:24.0 +0100
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  649c9d2f0f4a178adadc74f084e565e7f16ee7af
\ No newline at end of file
+  0988ac4d1d2b42a705640bd946f3eb9420258d65
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2 -> 
crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2 ++
 8213 lines of diff (skipped)




commit crmsh for openSUSE:Factory

2015-12-09 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-12-09 19:52:26

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-11-22 
11:02:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-12-09 
22:14:37.0 +0100
@@ -1,0 +2,15 @@
+Mon Dec 07 08:11:25 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1449475283.649c9d2:
+  + high: ui_configure: Move validate-all validation to a separate command 
(bsc#956442)
+  + high: scripts: Don't delete steps from upgraded wizards (bnc#957925)
+  + medium: scripts: Enable setting category in legacy wizards (bnc#957926)
+  + high: scripts: Don't require scripts to be an array of one element
+  + high: scripts: Conservatively verify scripts that modify the CIB 
(bsc#951954)
+  + high: ui_resource: Enable start/stop/status for multiple resources at once 
(bsc#952775)
+  + high: ui_resource: Add constraints and operations commands
+  + high: ui_ra: Add ra validate command (bsc#956442)
+  + high: script: Fix issues found in cluster scripts
+  + low: resource: Fix unban alias for unmigrate
+
+---

Old:

  crmsh-2.2.0~rc3+git.1447774225.24dd944.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.VYeFY0/_old  2015-12-09 22:14:39.0 +0100
+++ /var/tmp/diff_new_pack.VYeFY0/_new  2015-12-09 22:14:39.0 +0100
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc3+git.1447774225.24dd944
+Version:2.2.0~rc3+git.1449475283.649c9d2
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2
@@ -92,6 +92,7 @@
 Group:  %{pkg_group}
 Requires:   crmsh
 %if 0%{?with_regression_tests}
+BuildRequires:  mailx
 BuildRequires:  procps
 BuildRequires:  python-dateutil
 BuildRequires:  python-nose

++ _servicedata ++
--- /var/tmp/diff_new_pack.VYeFY0/_old  2015-12-09 22:14:39.0 +0100
+++ /var/tmp/diff_new_pack.VYeFY0/_new  2015-12-09 22:14:39.0 +0100
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  24dd9445d95803f77eeb0325b1196bf2288d1044
\ No newline at end of file
+  649c9d2f0f4a178adadc74f084e565e7f16ee7af
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1447774225.24dd944.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1447774225.24dd944/.travis.yml 
new/crmsh-2.2.0~rc3+git.1449475283.649c9d2/.travis.yml
--- old/crmsh-2.2.0~rc3+git.1447774225.24dd944/.travis.yml  2015-11-19 
14:54:28.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1449475283.649c9d2/.travis.yml  2015-12-07 
09:11:25.0 +0100
@@ -1,4 +1,5 @@
 ---
+sudo: false
 language: python
 python:
   - "2.6"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1447774225.24dd944/data-manifest 
new/crmsh-2.2.0~rc3+git.1449475283.649c9d2/data-manifest
--- old/crmsh-2.2.0~rc3+git.1447774225.24dd944/data-manifest2015-11-19 
14:54:28.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1449475283.649c9d2/data-manifest2015-12-07 
09:11:25.0 +0100
@@ -162,6 +162,7 @@
 test/unittests/test_parse.py
 test/unittests/test_resource.py
 test/unittests/test_scripts.py
+test/unittests/test_time.py
 test/unittests/test_utils.py
 utils/crm_clean.py
 utils/crm_init.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1447774225.24dd944/doc/crm.8.adoc 
new/crmsh-2.2.0~rc3+git.1449475283.649c9d2/doc/crm.8.adoc
--- old/crmsh-2.2.0~rc3+git.1447774225.24dd944/doc/crm.8.adoc   2015-11-19 
14:54:28.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1449475283.649c9d2/doc/crm.8.adoc   2015-12-07 
09:11:25.0 +0100
@@ -1564,6 +1564,18 @@
 providers apache
 ...
 
+[[cmdhelp_ra_validate,validate parameters for RA]]
+ `validate`
+
+If the resource agent supports the `validate-all` action, this calls
+the action with the given parameters, printing any warnings or errors
+reported by the agent.
+
+Usage:
+
+validate  [= ...]
+
+
 [[cmdhelp_resource,Resource management]]
 === `resource` - Resource management
 
@@ -1748,21 +1760,22 @@
 reprobe []
 

commit crmsh for openSUSE:Factory

2015-11-22 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-11-22 11:00:38

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-11-10 
10:03:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-11-22 
11:02:40.0 +0100
@@ -1,0 +2,6 @@
+Thu Nov 19 13:54:29 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1447774225.24dd944:
+  + high: xmlutil: Order is significant in resource_set (bsc#955434)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1447033314.c640af6.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1447774225.24dd944.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.8GIWK3/_old  2015-11-22 11:02:41.0 +0100
+++ /var/tmp/diff_new_pack.8GIWK3/_new  2015-11-22 11:02:41.0 +0100
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc3+git.1447033314.c640af6
+Version:2.2.0~rc3+git.1447774225.24dd944
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.8GIWK3/_old  2015-11-22 11:02:41.0 +0100
+++ /var/tmp/diff_new_pack.8GIWK3/_new  2015-11-22 11:02:41.0 +0100
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  c640af66732c310de38b4cc37308eaff466ede66
\ No newline at end of file
+  24dd9445d95803f77eeb0325b1196bf2288d1044
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1447033314.c640af6.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1447774225.24dd944.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1447033314.c640af6/modules/xmlutil.py 
new/crmsh-2.2.0~rc3+git.1447774225.24dd944/modules/xmlutil.py
--- old/crmsh-2.2.0~rc3+git.1447033314.c640af6/modules/xmlutil.py   
2015-11-09 03:13:51.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1447774225.24dd944/modules/xmlutil.py   
2015-11-19 14:54:29.0 +0100
@@ -1202,7 +1202,10 @@
 
 
 def xml_equals_unordered(a, b):
-"used by xml_equals to compare xml trees without ordering"
+"""
+used by xml_equals to compare xml trees without ordering.
+NOTE: resource_set children SHOULD be compared with ordering.
+"""
 def fail(msg):
 common_debug("%s!=%s: %s" % (a.tag, b.tag, msg))
 return False
@@ -1233,8 +1236,11 @@
 
 # order matters here, but in a strange way:
 # all primitive tags should sort the same..
-sorted_children = zip(sorted(a, key=sortby), sorted(b, key=sortby))
-return all(xml_equals_unordered(a, b) for a, b in sorted_children)
+if a.tag == 'resource_set':
+return all(xml_equals_unordered(a, b) for a, b in zip(a, b))
+else:
+sorted_children = zip(sorted(a, key=sortby), sorted(b, key=sortby))
+return all(xml_equals_unordered(a, b) for a, b in sorted_children)
 
 
 def xml_equals(n, m, show=False):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1447033314.c640af6/test/unittests/test_bugs.py 
new/crmsh-2.2.0~rc3+git.1447774225.24dd944/test/unittests/test_bugs.py
--- old/crmsh-2.2.0~rc3+git.1447033314.c640af6/test/unittests/test_bugs.py  
2015-11-09 03:13:51.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1447774225.24dd944/test/unittests/test_bugs.py  
2015-11-19 14:54:29.0 +0100
@@ -810,3 +810,29 @@
 if o.node.tag == 'fencing-topology':
 assert o.check_sanity() == 0
 
+
+@with_setup(setup_func, teardown_func)
+def test_reordering_resource_sets():
+"""
+Can we reorder resource sets?
+"""
+from crmsh import clidisplay
+obj1 = factory.create_object('primitive', 'p1', 'Dummy')
+assert obj1 is True
+obj2 = factory.create_object('primitive', 'p2', 'Dummy')
+assert obj2 is True
+obj3 = factory.create_object('primitive', 'p3', 'Dummy')
+assert obj3 is True
+obj4 = factory.create_object('primitive', 'p4', 'Dummy')
+assert obj4 is True
+o1 = factory.create_object('order', 'o1', 'p1', 'p2', 'p3', 'p4')
+assert o1 is True
+
+obj = cibconfig.mkset_obj('o1')
+assert obj is not None
+rc = obj.save('order o1 p4 p3 p2 p1')
+assert rc == True
+
+obj2 = cibconfig.mkset_obj('o1')
+with clidisplay.nopretty():
+assert "order o1 p4 p3 p2 p1" == obj2.repr().strip()




commit crmsh for openSUSE:Factory

2015-11-10 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-11-10 10:03:29

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-10-30 
13:43:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-11-10 
10:03:36.0 +0100
@@ -1,0 +2,8 @@
+Mon Nov 09 02:13:51 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1447033314.c640af6:
+  + medium: script: (filesystem) create stopped (bsc#952670)
+  + doc: configure load can read from stdin
+  + medium: scripts: Lower copy target to string
+
+---

Old:

  crmsh-2.2.0~rc3+git.1446121677.5f4ab3c.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1447033314.c640af6.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.XLIPPv/_old  2015-11-10 10:03:37.0 +0100
+++ /var/tmp/diff_new_pack.XLIPPv/_new  2015-11-10 10:03:37.0 +0100
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc3+git.1446121677.5f4ab3c
+Version:2.2.0~rc3+git.1447033314.c640af6
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.XLIPPv/_old  2015-11-10 10:03:37.0 +0100
+++ /var/tmp/diff_new_pack.XLIPPv/_new  2015-11-10 10:03:37.0 +0100
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  5f4ab3c5cfbc79d4858dc6cefbfa0311a3d0c67d
\ No newline at end of file
+  c640af66732c310de38b4cc37308eaff466ede66
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1446121677.5f4ab3c.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1447033314.c640af6.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/doc/crm.8.adoc 
new/crmsh-2.2.0~rc3+git.1447033314.c640af6/doc/crm.8.adoc
--- old/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/doc/crm.8.adoc   2015-10-29 
13:29:21.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1447033314.c640af6/doc/crm.8.adoc   2015-11-09 
03:13:51.0 +0100
@@ -2903,6 +2903,8 @@
 import the contents into the current configuration.
 The file may be a CLI file or an XML file.
 
+If the URL is `-`, the configuration is read from standard input.
+
 Usage:
 ...
 load [xml]  URL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/modules/scripts.py 
new/crmsh-2.2.0~rc3+git.1447033314.c640af6/modules/scripts.py
--- old/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/modules/scripts.py   
2015-10-29 13:29:21.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1447033314.c640af6/modules/scripts.py   
2015-11-09 03:13:51.0 +0100
@@ -307,7 +307,7 @@
 if self._action['template']:
 fn = self._run.str2tmp(str(Text.cib(self._run.script, 
open(self._value).read(
 self._value = fn
-self._run.copy_file(self._nodes, self._value, self._action['to'])
+self._run.copy_file(self._nodes, self._value, str(self._action['to']))
 
 def _crm_do(self, act):
 fn = self._run.str2tmp(_join_script_lines(self._value))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/scripts/filesystem/main.yml 
new/crmsh-2.2.0~rc3+git.1447033314.c640af6/scripts/filesystem/main.yml
--- old/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/scripts/filesystem/main.yml  
2015-10-29 13:29:21.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1447033314.c640af6/scripts/filesystem/main.yml  
2015-11-09 03:13:51.0 +0100
@@ -22,6 +22,7 @@
   required: false
   type: string
   ops: |
+meta target-state=Stopped
 op start timeout=60s
 op stop timeout=60s
 op monitor interval=20s timeout=40s




commit crmsh for openSUSE:Factory

2015-10-30 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-10-30 13:43:48

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-10-28 
17:31:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-10-30 
13:43:49.0 +0100
@@ -1,0 +2,8 @@
+Thu Oct 29 12:29:21 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1446121677.5f4ab3c:
+  + high: scripts: Eval CIB text in correct scope (bsc#952600)
+  + medium: scripts: Check required parameters for optional sub-steps
+  + medium: utils: Fix python 2.6 compatibility
+
+---

Old:

  crmsh-2.2.0~rc3+git.1446022288.cbb7d77.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1446121677.5f4ab3c.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.DgGbLm/_old  2015-10-30 13:43:50.0 +0100
+++ /var/tmp/diff_new_pack.DgGbLm/_new  2015-10-30 13:43:50.0 +0100
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc3+git.1446022288.cbb7d77
+Version:2.2.0~rc3+git.1446121677.5f4ab3c
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.DgGbLm/_old  2015-10-30 13:43:50.0 +0100
+++ /var/tmp/diff_new_pack.DgGbLm/_new  2015-10-30 13:43:50.0 +0100
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  cbb7d776f5489f5925d3e243f1d2844c743fe889
\ No newline at end of file
+  5f4ab3c5cfbc79d4858dc6cefbfa0311a3d0c67d
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1446022288.cbb7d77.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1446121677.5f4ab3c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/report.py 
new/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/modules/report.py
--- old/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/report.py
2015-10-28 09:51:59.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/modules/report.py
2015-10-29 13:29:21.0 +0100
@@ -591,7 +591,7 @@
 self.end_ts = syslog_ts(end_msg)
 else:
 common_warn("end of transition %s not found in logs (transition 
not complete yet?)" % self)
-self.end_ts = (datetime.datetime(2525, 1, 1) - 
datetime.datetime(1970, 1, 1)).total_seconds()
+self.end_ts = datetime_to_timestamp(datetime.datetime(2525, 1, 1))
 
 def __str__(self):
 return self.get_node_file()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/scripts.py 
new/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/modules/scripts.py
--- old/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/scripts.py   
2015-10-28 09:51:59.0 +0100
+++ new/crmsh-2.2.0~rc3+git.1446121677.5f4ab3c/modules/scripts.py   
2015-10-29 13:29:21.0 +0100
@@ -185,8 +185,8 @@
 return ' -> '.join(x.items()[0])
 action['text'] = '\n'.join([arrow(x) for x in value])
 elif name == 'cib' or name == 'crm':
-action['text'] = Text.cib(script, value)
-action['value'] = _remove_empty_lines(str(action['text']))
+action['text'] = str(Text.cib(script, value))
+action['value'] = _remove_empty_lines(action['text'])
 elif name == 'call':
 action['value'] = Text(script, value)
 elif name == 'copy':
@@ -1422,8 +1422,15 @@
 params[key] = value
 
 def _fill_values(path, into, source, srcreq):
+"""
+Copy values into into while checking for missing required parameters.
+If into has content, all required parameters ARE required, even if the
+whole step is not required (since we're supplying it). This is checked
+by checking if the step is not required, but there are some parameters
+set by the user anyway.
+"""
 if 'required' in source:
-srcreq = source['required'] and srcreq
+srcreq = (source['required'] and srcreq) or (into and srcreq)
 
 for param in source.get('parameters', []):
 if param['name'] not in into:
@@ -1436,12 +1443,14 @@
 required = step.get('required', True)
 if not required and step['name'] not in into:
 

commit crmsh for openSUSE:Factory

2015-10-28 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-10-28 17:31:17

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-10-22 
12:59:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-10-28 
17:31:17.0 +0100
@@ -1,0 +2,13 @@
+Wed Oct 28 08:51:59 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1446022288.cbb7d77:
+  + medium: scripts: No optional steps in legacy wizards (bsc#952226)
+  + medium: ui_script: Tag legacy wizards as legacy in show (bsc#952226)
+
+---
+Mon Oct 26 12:41:17 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1445863187.686e3ec:
+  + high: utils: Revised time zone handling (bsc#951759)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1445338389.7433378.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1446022288.cbb7d77.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.j686HU/_old  2015-10-28 17:31:18.0 +0100
+++ /var/tmp/diff_new_pack.j686HU/_new  2015-10-28 17:31:18.0 +0100
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc3+git.1445338389.7433378
+Version:2.2.0~rc3+git.1446022288.cbb7d77
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.j686HU/_old  2015-10-28 17:31:18.0 +0100
+++ /var/tmp/diff_new_pack.j686HU/_new  2015-10-28 17:31:18.0 +0100
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  7433378e1abf96bf84b4af781cec9ab16f6ed5f5
\ No newline at end of file
+  cbb7d776f5489f5925d3e243f1d2844c743fe889
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1445338389.7433378.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1446022288.cbb7d77.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/constants.py 
new/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/constants.py
--- old/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/constants.py 
2015-10-20 13:14:01.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/constants.py 
2015-10-28 09:51:59.0 +0100
@@ -264,13 +264,14 @@
 "primitive": {
 "fillcolor": "#e4e5e6",
 "color": "#b9b9b9",
-"style": "filled",
+"shape": "box",
+"style": "rounded,filled",
 },
 "rsc_template": {
-"fillcolor": "#e4e5e6",
+"fillcolor": "#ffd457",
 "color": "#b9b9b9",
-"style": "filled",
-"shape": "invhouse",
+"shape": "box",
+"style": "rounded,filled,dashed",
 },
 "class:stonith": {
 "shape": "box",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/report.py 
new/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/report.py
--- old/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/report.py
2015-10-20 13:14:01.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1446022288.cbb7d77/modules/report.py
2015-10-28 09:51:59.0 +0100
@@ -72,28 +72,30 @@
 return t
 
 
+_syslog2node_formats = (re.compile(r'^[a-zA-Z]{2,4} \d{1,2} 
\d{2}:\d{2}:\d{2}\s+(?:\[\d+\])?\s*([\S]+)'),
+
re.compile(r'^\d{4}-\d{2}-\d{2}T\S+\s+(?:\[\d+\])?\s*([\S]+)'))
+
+
 def syslog_ts(s):
 """
 Finds the timestamp in the given line
 Returns as floating point, seconds
 """
-try:
-# strptime defaults year to 1900 (sigh)
-# strptime returns a time_struct
-tm = time.strptime(' '.join([YEAR] + s.split()[0:3]),
-   "%Y %b %d %H:%M:%S")
-ts = time.mktime(tm)
-except:  # try the rfc5424
-try:
-ts = datetime_to_timestamp(parse_time(s.split()[0]))
-except Exception:
-common_debug("malformed line: %s" % s)
-return None
-return ts
+fmt1, fmt2 = _syslog2node_formats
+m = fmt1.match(s)
+if m:
+if YEAR is None:
+set_year()
+tstr = ' '.join([YEAR] + s.split()[0:3])
+return datetime_to_timestamp(parse_time(tstr))
 
+m = fmt2.match(s)
+if m:
+tstr = s.split()[0]
+return 

commit crmsh for openSUSE:Factory

2015-10-22 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-10-22 12:59:23

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-10-20 
00:05:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-10-22 
12:59:28.0 +0200
@@ -1,0 +2,7 @@
+Tue Oct 20 11:14:01 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1445338389.7433378:
+  + high: scripts: Fix DRBD script resource reference (bsc#951028)
+  + low: constants: Tweaked graph colors
+
+---

Old:

  crmsh-2.2.0~rc3+git.1444854254.fc37f7f.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1445338389.7433378.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.talPCG/_old  2015-10-22 12:59:28.0 +0200
+++ /var/tmp/diff_new_pack.talPCG/_new  2015-10-22 12:59:28.0 +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.1444854254.fc37f7f
+Version:2.2.0~rc3+git.1445338389.7433378
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.talPCG/_old  2015-10-22 12:59:28.0 +0200
+++ /var/tmp/diff_new_pack.talPCG/_new  2015-10-22 12:59:28.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  fc37f7f872a065147e3c0c32e962a924cad109b3
\ No newline at end of file
+  7433378e1abf96bf84b4af781cec9ab16f6ed5f5
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1444854254.fc37f7f.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1445338389.7433378.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cibconfig.py 
new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cibconfig.py
--- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cibconfig.py 
2015-10-15 07:18:06.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cibconfig.py 
2015-10-20 13:14:01.0 +0200
@@ -2169,7 +2169,6 @@
 rc = False
 return rc
 
-
 def apply(self, factory, mode='cli', no_remove=False, method='replace'):
 rc = True
 
@@ -2691,9 +2690,10 @@
 
 def find_objects(self, obj_id):
 "Find objects for id (can be a wildcard-glob)."
+def matchfn(x):
+return x and fnmatch.fnmatch(x, obj_id)
 if not self.is_cib_sane() or obj_id is None:
 return None
-matchfn = lambda x: x and fnmatch.fnmatch(x, obj_id)
 objs = []
 for obj in self.cib_objects:
 if matchfn(obj.obj_id):
@@ -3690,9 +3690,7 @@
 erase_ok = True
 l = []
 rscstat = RscState()
-for obj in [obj for obj in self.cib_objects
-if not obj.children and not is_constraint(obj.node)
-and obj.obj_type != "node"]:
+for obj in [obj for obj in self.cib_objects if not obj.children and 
not is_constraint(obj.node) and obj.obj_type != "node"]:
 if not rscstat.can_delete(obj.obj_id):
 common_warn("resource %s is running, can't delete it" % 
obj.obj_id)
 erase_ok = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cliformat.py 
new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cliformat.py
--- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cliformat.py 
2015-10-15 07:18:06.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cliformat.py 
2015-10-20 13:14:01.0 +0200
@@ -386,8 +386,8 @@
 
 def cli_acl_permission(node):
 s = [clidisplay.keyword(node.get('kind'))]
-#if node.get('id'):
-#s.append(head_id_format(node.get('id')))
+# if node.get('id'):
+# s.append(head_id_format(node.get('id')))
 if node.get('description'):
 s.append(nvpair_format('description', node.get('description')))
 for attrname, cliname in constants.acl_spec_map_2_rev:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cmd_status.py 
new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cmd_status.py
--- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cmd_status.py
2015-10-15 07:18:06.0 +0200
+++ 

commit crmsh for openSUSE:Factory

2015-10-12 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-10-12 10:02: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  2015-10-02 
09:23:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-10-12 
10:02:44.0 +0200
@@ -1,0 +2,25 @@
+Thu Oct 08 21:44:06 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1444340345.59850ca:
+  + high: utils: Fix cluster_copy_file error when nodes provided (bsc#949603)
+  + low: xmlutil: More informative message when updating resource references 
after rename
+  + doc: fix some command syntax grammar in the man page
+  + doc: resource-discovery for location constraints
+
+---
+Tue Oct 06 12:22:30 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1444133917.3f7f79f:
+  + high: cibconfig: Fix bug in is_edit_valid (bsc#948547)
+  + high: cibconfig: Delete constraints before resources
+
+---
+Tue Oct 06 09:14:24 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1444122392.193bf69:
+  + high: cibconfig: Allow nodes and resources with the same ID (bsc#948547)
+  + high: cibconfig: Allow node/rsc id collision in _set_update (bsc#948547)
+  + medium: hb_report: Don't cat binary logs
+  + low: report: Silence tar warning on early stream close
+
+---

Old:

  crmsh-2.2.0~rc3+git.1443544100.aa2abda.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1444340345.59850ca.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.lYKxtr/_old  2015-10-12 10:02:44.0 +0200
+++ /var/tmp/diff_new_pack.lYKxtr/_new  2015-10-12 10:02:44.0 +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.1443544100.aa2abda
+Version:2.2.0~rc3+git.1444340345.59850ca
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.lYKxtr/_old  2015-10-12 10:02:44.0 +0200
+++ /var/tmp/diff_new_pack.lYKxtr/_new  2015-10-12 10:02:44.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  aa2abdad0c401d1cebf43e1a20da26b3de2992c5
\ No newline at end of file
+  59850ca9ed07b3e965170b1fb50712ea1bfa502f
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1443544100.aa2abda.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1444340345.59850ca.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1443544100.aa2abda/doc/crm.8.adoc 
new/crmsh-2.2.0~rc3+git.1444340345.59850ca/doc/crm.8.adoc
--- old/crmsh-2.2.0~rc3+git.1443544100.aa2abda/doc/crm.8.adoc   2015-09-30 
17:21:36.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1444340345.59850ca/doc/crm.8.adoc   2015-10-08 
23:44:05.0 +0200
@@ -797,12 +797,12 @@
 
 id_spec :: $id= | $id-ref=
 score ::  |  | [-]inf
-expression ::  [bool_op  ...]
+expression ::  [  ...]
 bool_op :: or | and
 simple_exp ::  [type:] 
   |  
   | date 
-type :: string | version | number
+type ::  |  | 
 binary_op :: lt | gt | lte | gte | eq | ne
 unary_op :: defined | not_defined
 
@@ -2574,8 +2574,8 @@
 ...
 clone  
   [description=]
-  [meta attr_list]
-  [params attr_list]
+  [meta ]
+  [params ]
 
 attr_list :: [$id=] = [=...] | $id-ref=
 ...
@@ -2622,13 +2622,13 @@
 colocation  : [:] [:]
   [node-attribute=]
 
-colocation  : resource_sets
+colocation  : 
   [node-attribute=]
 
-resource_sets :: resource_set [resource_set ...]
+resource_sets ::  [ ...]
 
 resource_set :: ["("|"["] [:] [[:] ...] \
-[attributes]  [")"|"]"]
+[]  [")"|"]"]
 
 attributes :: [require-all=(true|false)] [sequential=(true|false)]
 
@@ -2924,6 +2924,9 @@
 * Tag containing resource ids: +location loc1 tag1 100: node1+
 * Resource pattern: +location loc1 /web.*/ 100: node1+
 
+The +resource-discovery+ attribute allows probes to be selectively
+enabled or disabled per resource and node.
+
 The syntax for resource sets is described in detail for
 <>.
 
@@ -2935,12 +2938,14 @@
 
 Usage:
 ...
-location  rsc [role=] {node_pref|rules}
+location   [] {|}
 
 rsc :: //
 | { resource_sets }
 | 
 
+attributes :: role= | 

commit crmsh for openSUSE:Factory

2015-10-02 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-10-02 09:23:50

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-30 
05:52:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-10-02 
09:23:51.0 +0200
@@ -1,0 +2,9 @@
+Wed Sep 30 15:21:36 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1443544100.aa2abda:
+  + medium: report: Enable opening .xz-compressed report tarballs
+  + medium: config: Always fall back to /usr/bin:/usr/sbin:/bin:/sbin for 
programs (bsc#947818)
+  + low: ui_resource: Silence spurious migration non-warning from pacemaker
+  + high: log_patterns_118: Update the correct set of log patterns (bsc#942906)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1443105613.80a246f.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1443544100.aa2abda.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.JUC9MH/_old  2015-10-02 09:23:52.0 +0200
+++ /var/tmp/diff_new_pack.JUC9MH/_new  2015-10-02 09:23:52.0 +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.1443105613.80a246f
+Version:2.2.0~rc3+git.1443544100.aa2abda
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.JUC9MH/_old  2015-10-02 09:23:52.0 +0200
+++ /var/tmp/diff_new_pack.JUC9MH/_new  2015-10-02 09:23:52.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  80a246fe1ae9fdf650c8806452bd4171160433d2
\ No newline at end of file
+  aa2abdad0c401d1cebf43e1a20da26b3de2992c5
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1443105613.80a246f.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1443544100.aa2abda.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/config.py 
new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/config.py
--- old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/config.py
2015-09-24 16:41:01.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/config.py
2015-09-30 17:21:36.0 +0200
@@ -57,18 +57,20 @@
 
 def _find_program(self, prog):
 """Is this program available?"""
+paths = os.getenv("PATH").split(os.pathsep)
+paths.extend(['/usr/bin', '/usr/sbin', '/bin', '/sbin'])
 if prog.startswith('/'):
 filename = make_path(prog)
 if os.path.isfile(filename) and os.access(filename, os.X_OK):
 return filename
 elif prog.startswith('%'):
 prog = make_path(prog)
-for p in os.getenv("PATH").split(os.pathsep):
+for p in paths:
 filename = os.path.join(p, prog)
 if os.path.isfile(filename) and os.access(filename, os.X_OK):
 return filename
 else:
-for p in os.getenv("PATH").split(os.pathsep):
+for p in paths:
 filename = make_path(os.path.join(p, prog))
 if os.path.isfile(filename) and os.access(filename, os.X_OK):
 return filename
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/log_patterns_118.py 
new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/log_patterns_118.py
--- old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/log_patterns_118.py  
2015-09-24 16:41:01.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/log_patterns_118.py  
2015-09-30 17:21:36.0 +0200
@@ -25,8 +25,8 @@
( # detail 0

"crmd.*Initiating.*%%_(?:start|stop|promote|demote|migrate)_",
"lrmd.*operation_finished: %%_",
-   "crmd.*process_lrm_event: LRM operation 
%%_(?:start|stop|promote|demote|migrate)_.*confirmed=true",
-   "crmd.*process_lrm_event: LRM operation %%_.*Timed Out",
+   "crmd.*LRM operation 
%%_(?:start|stop|promote|demote|migrate)_.*confirmed=true",
+   "crmd.*LRM operation %%_.*Timed Out",
"[(]%%[)][[]",
),
( # detail 1
@@ -41,16 +41,16 @@
" 

commit crmsh for openSUSE:Factory

2015-09-29 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-09-30 05:51:53

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-24 
06:16:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-09-30 
05:52:03.0 +0200
@@ -1,0 +2,14 @@
+Thu Sep 24 14:41:02 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1443105613.80a246f:
+  + medium: cibconfig: Only warn for grouped children in colocations 
(bsc#927423)
+
+---
+Thu Sep 24 13:56:27 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1443102798.74361f5:
+  + high: ui_node: Show remote nodes in crm node list (bsc#877962)
+  + medium: cibconfig: Warn if configuring constraint on child resource 
(bsc#927423) (#101)
+  + medium: cibconfig: Allow order constraints on group children (bsc#927423)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1442913222.4ba506b.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1443105613.80a246f.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.tpblRE/_old  2015-09-30 05:52:04.0 +0200
+++ /var/tmp/diff_new_pack.tpblRE/_new  2015-09-30 05:52:04.0 +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.1442913222.4ba506b
+Version:2.2.0~rc3+git.1443105613.80a246f
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.tpblRE/_old  2015-09-30 05:52:04.0 +0200
+++ /var/tmp/diff_new_pack.tpblRE/_new  2015-09-30 05:52:04.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  4ba506b414b9b5a6d6024880a6a1538b2d307968
\ No newline at end of file
+  80a246fe1ae9fdf650c8806452bd4171160433d2
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1442913222.4ba506b.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1443105613.80a246f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/cibconfig.py 
new/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/cibconfig.py
--- old/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/cibconfig.py 
2015-09-22 11:15:18.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/cibconfig.py 
2015-09-24 16:41:01.0 +0200
@@ -1622,6 +1622,28 @@
 child_rsc.repr_gv(sg_obj, from_grp=True)
 
 
+def _check_if_constraint_ref_is_child(obj):
+"""
+Used by check_sanity for constraints to verify
+that referenced resources are not children in
+a container.
+"""
+rc = 0
+for rscid in obj._referenced_resources():
+tgt = cib_factory.find_object(rscid)
+if not tgt:
+common_warn("%s: resource %s does not exist" % (obj.obj_id, rscid))
+rc = 1
+elif tgt.parent and tgt.parent.obj_type == "group":
+if obj.obj_type == "colocation":
+common_warn("%s: resource %s is grouped, constraints should 
apply to the group" % (obj.obj_id, rscid))
+rc = 1
+elif tgt.parent and tgt.parent.obj_type in constants.container_tags:
+common_warn("%s: resource %s ambiguous, apply constraints to 
container" % (obj.obj_id, rscid))
+rc = 1
+return rc
+
+
 class CibLocation(CibObject):
 '''
 Location constraint.
@@ -1692,8 +1714,15 @@
 if uname and uname.lower() not in ids:
 common_warn("%s: referenced node %s does not exist" % 
(self.obj_id, uname))
 rc = 1
+rc2 = _check_if_constraint_ref_is_child(self)
+if rc2 > rc:
+rc = rc2
 return rc
 
+def _referenced_resources(self):
+ret = self.node.xpath('.//resource_set/resource_ref/@id')
+return ret or [self.node.get("rsc")]
+
 def repr_gv(self, gv_obj, from_grp=False):
 '''
 What to do with the location constraint?
@@ -1830,6 +1859,23 @@
 self.node.get("first"),
 self.node.get("then")])
 
+def _referenced_resources(self):
+ret = self.node.xpath('.//resource_set/resource_ref/@id')
+if ret:
+return ret
+if self.obj_type == "order":
+return [self.node.get("first"), self.node.get("then")]
+ 

commit crmsh for openSUSE:Factory

2015-09-23 Thread h_root
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-09-24 
06:16:08.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 22 09:15:19 UTC 2015 - kgronl...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.wX4tE2/_new  2015-09-24 06:16:09.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.wX4tE2/_new  2015-09-24 06:16:09.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  a9a616da75689af2b80f39d530e99e8aa855da64
\ No newline at end of file
+  4ba506b414b9b5a6d6024880a6a1538b2d307968
\ 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.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/crm.conf.in  2015-09-22 
11:15:18.0 +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.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/config.py
2015-09-22 11:15:18.0 +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.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1442913222.4ba506b/modules/msg.py   2015-09-22 
11:15:18.0 +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 

commit crmsh for openSUSE:Factory

2015-09-13 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-09-13 09:45:11

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-08 
17:44:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-09-13 
09:45:18.0 +0200
@@ -1,0 +2,14 @@
+Fri Sep 11 10:21:55 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1441965248.a9a616d:
+  + low: scripts: Fix typo in email type verifier
+  + low: scripts: [MailTo] install mailx package
+  + high: scripts: Add enum type to script values
+  + medium: parse: Add support for node attribute as fencing topology target
+  + doc: Improve documentation for the history level
+  + low: ui_history: Swap from and to times if to < from
+  + low: ui_history: Better error handling and documentation for the detail 
command
+  + medium: report: Add transition tags command (bsc#943470)
+  + medium: report: Mark transitions with errors with a star in info output 
(bsc#943470)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1441319359.d823416.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1441965248.a9a616d.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.cU0IDa/_old  2015-09-13 09:45:19.0 +0200
+++ /var/tmp/diff_new_pack.cU0IDa/_new  2015-09-13 09:45:19.0 +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.1441319359.d823416
+Version:2.2.0~rc3+git.1441965248.a9a616d
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.cU0IDa/_old  2015-09-13 09:45:19.0 +0200
+++ /var/tmp/diff_new_pack.cU0IDa/_new  2015-09-13 09:45:19.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  d823416786d3e5c66d27d6de2fe43228df22fdac
\ No newline at end of file
+  a9a616da75689af2b80f39d530e99e8aa855da64
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1441319359.d823416.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1441965248.a9a616d.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1441319359.d823416/data-manifest 
new/crmsh-2.2.0~rc3+git.1441965248.a9a616d/data-manifest
--- old/crmsh-2.2.0~rc3+git.1441319359.d823416/data-manifest2015-09-04 
10:08:47.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1441965248.a9a616d/data-manifest2015-09-11 
12:21:55.0 +0200
@@ -30,6 +30,7 @@
 scripts/init/verify.py
 scripts/libvirt/main.yml
 scripts/lvm/main.yml
+scripts/mailto/main.yml
 scripts/nfsserver/main.yml
 scripts/ocfs2/main.yml
 scripts/oracle/main.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1441319359.d823416/doc/crm.8.adoc 
new/crmsh-2.2.0~rc3+git.1441965248.a9a616d/doc/crm.8.adoc
--- old/crmsh-2.2.0~rc3+git.1441319359.d823416/doc/crm.8.adoc   2015-09-04 
10:08:47.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1441965248.a9a616d/doc/crm.8.adoc   2015-09-11 
12:21:55.0 +0200
@@ -2755,14 +2755,19 @@
 If the node is left out, the order is used for all nodes.
 That should reduce the configuration size in some stonith setups.
 
+From Pacemaker version 1.1.14, it is possible to use a node attribute
+as the +target+ in a fencing topology. The syntax for this usage is
+described below.
+
 Usage:
 ...
 fencing_topology stonith_resources [stonith_resources ...]
 fencing_topology fencing_order [fencing_order ...]
 
-fencing_order :: : stonith_resources [stonith_resources ...]
+fencing_order :: target stonith_resources [stonith_resources ...]
 
 stonith_resources :: [,...]
+target :: : | attr:=
 ...
 Example:
 ...
@@ -2770,6 +2775,7 @@
 fencing_topology \
 node-a: poison-pill power
 node-b: ipmi serial
+fencing_topology attr:rack=1 apc01,apc02
 ...
 
 [[cmdhelp_configure_filter,filter CIB objects]]
@@ -4220,34 +4226,42 @@
 [[cmdhelp_history,Cluster history]]
 === `history` - Cluster history
 
-Examining Pacemaker's history is a particularly involved task.
-The number of subsystems to be considered, the complexity of the
-configuration, and the set of various information sources, most
-of which are not exactly human readable, keep analyzing resource
-or node problems accessible to only the most knowledgeable. Or,
-depending on the point of 

commit crmsh for openSUSE:Factory

2015-09-08 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-09-08 17:39:46

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-08-31 
22:59:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-09-08 
17:44:35.0 +0200
@@ -1,0 +2,11 @@
+Fri Sep 04 08:08:48 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1441319359.d823416:
+  + high: scripts: Generate actions for includes if none are defined
+  + high: script: Fix subscript agent reference bug
+  + medium: crm_pssh: Timeout is an int (bsc#943820)
+  + medium: scripts: Fix typo in lvm script
+  + low: scripts: [virtual-ip] make lvs_support an advanced parameter
+  + low: constants: Add meta attributes for remote nodes
+
+---

Old:

  crmsh-2.2.0~rc3+git.1440887645.cd6ac8a.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1441319359.d823416.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.2xqdkY/_old  2015-09-08 17:44:37.0 +0200
+++ /var/tmp/diff_new_pack.2xqdkY/_new  2015-09-08 17:44:37.0 +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.1440887645.cd6ac8a
+Version:2.2.0~rc3+git.1441319359.d823416
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.2xqdkY/_old  2015-09-08 17:44:37.0 +0200
+++ /var/tmp/diff_new_pack.2xqdkY/_new  2015-09-08 17:44:37.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  cd6ac8af585a2f35074fcdeafba7a8e50bcd568f
\ No newline at end of file
+  d823416786d3e5c66d27d6de2fe43228df22fdac
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1440887645.cd6ac8a.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1441319359.d823416.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/constants.py 
new/crmsh-2.2.0~rc3+git.1441319359.d823416/modules/constants.py
--- old/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/constants.py 
2015-08-31 08:45:12.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1441319359.d823416/modules/constants.py 
2015-09-04 10:08:47.0 +0200
@@ -206,7 +206,7 @@
 "migration-threshold", "priority", "multiple-active",
 "failure-timeout", "resource-stickiness", "target-role",
 "restart-type", "description", "remote-node", "requires",
-"provides"
+"provides", "remote-port", "remote-addr", "remote-connect-timeout"
 )
 group_meta_attributes = ("container", )
 clone_meta_attributes = (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/crm_pssh.py 
new/crmsh-2.2.0~rc3+git.1441319359.d823416/modules/crm_pssh.py
--- old/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/crm_pssh.py  
2015-08-31 08:45:12.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1441319359.d823416/modules/crm_pssh.py  
2015-09-04 10:08:47.0 +0200
@@ -31,7 +31,7 @@
 Parse the given commandline arguments.
 '''
 opts = Options()
-opts.timeout = t
+opts.timeout = int(t)
 opts.quiet = True
 opts.inline = False
 opts.outdir = outdir
@@ -195,7 +195,7 @@
 l.append([node, cmd])
 if not l:
 return True
-opts = parse_args(outdir, errdir, t=str(int(timeout/1000)))
+opts = parse_args(outdir, errdir, t=int(timeout/1000))
 return do_pssh(l, opts)
 
 # vim:ts=4:sw=4:et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/scripts.py 
new/crmsh-2.2.0~rc3+git.1441319359.d823416/modules/scripts.py
--- old/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/scripts.py   
2015-08-31 08:45:12.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1441319359.d823416/modules/scripts.py   
2015-09-04 10:08:47.0 +0200
@@ -923,6 +923,11 @@
 if 'actions' not in script:
 script['actions'] = []
 
+# if we include subscripts but have no defined actions, assume that's a
+# mistake and generate include actions for all includes
+for inc in [{"include": inc['name']} for inc in script.get('include', 
[])]:
+script['actions'].append(inc)
+
 _postprocess_script_steps(script)
 
 # Includes may 

commit crmsh for openSUSE:Factory

2015-08-31 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-08-31 22:59:25

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-08-28 
08:27:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-08-31 
22:59:27.0 +0200
@@ -1,0 +2,9 @@
+Mon Aug 31 06:45:13 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1440887645.cd6ac8a:
+  + doc: Clarify documentation for colocations using node-attribute
+  + high: parse: Fix crash when referencing score types by name (bsc#940194)
+  + low: scripts: Improved script parameter validation
+  + medium: scripts: Add MailTo script
+
+---

Old:

  crmsh-2.2.0~rc3+git.1440626270.8872dbc.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1440887645.cd6ac8a.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.eqIzqs/_old  2015-08-31 22:59:28.0 +0200
+++ /var/tmp/diff_new_pack.eqIzqs/_new  2015-08-31 22:59:28.0 +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.1440626270.8872dbc
+Version:2.2.0~rc3+git.1440887645.cd6ac8a
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.eqIzqs/_old  2015-08-31 22:59:28.0 +0200
+++ /var/tmp/diff_new_pack.eqIzqs/_new  2015-08-31 22:59:28.0 +0200
@@ -1,4 +1,4 @@
 
 
 git://github.com/ClusterLabs/crmsh.git
-  8872dbc78204535d7b544393bef03c7bf485441f
\ No newline at end of file
+  cd6ac8af585a2f35074fcdeafba7a8e50bcd568f
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1440626270.8872dbc.tar.bz2 -> 
crmsh-2.2.0~rc3+git.1440887645.cd6ac8a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1440626270.8872dbc/doc/crm.8.adoc 
new/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/doc/crm.8.adoc
--- old/crmsh-2.2.0~rc3+git.1440626270.8872dbc/doc/crm.8.adoc   2015-08-27 
00:01:24.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/doc/crm.8.adoc   2015-08-31 
08:45:12.0 +0200
@@ -2608,8 +2608,11 @@
 
 Sets cannot be nested.
 
-The optional +node-attribute+ references an attribute in nodes'
-instance attributes.
+The optional +node-attribute+ can be used to colocate resources on a
+set of nodes and not necessarily on the same node. For example, by
+setting a node attribute +color+ on all nodes and setting the
++node-attribute+ value to +color+ as well, the colocated resources
+will be placed on any node that has the same color.
 
 For more details on how to configure resource sets, see
 <>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1440626270.8872dbc/modules/parse.py 
new/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/parse.py
--- old/crmsh-2.2.0~rc3+git.1440626270.8872dbc/modules/parse.py 2015-08-27 
00:01:24.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/parse.py 2015-08-31 
08:45:12.0 +0200
@@ -495,7 +495,7 @@
 
 def validate_score(self, score, noattr=False):
 if not noattr and score in olist(constants.score_types):
-return constants.score_types[score.lower()]
+return ["score", constants.score_types[score.lower()]]
 elif re.match("^[+-]?(inf(inity)?|INF(INITY)?|[0-9]+)$", score):
 score = re.sub("inf(inity)?|INF(INITY)?", "INFINITY", score)
 return ["score", score]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1440626270.8872dbc/modules/scripts.py 
new/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/scripts.py
--- old/crmsh-2.2.0~rc3+git.1440626270.8872dbc/modules/scripts.py   
2015-08-27 00:01:24.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1440887645.cd6ac8a/modules/scripts.py   
2015-08-31 08:45:12.0 +0200
@@ -1272,11 +1272,11 @@
 elif type == 'integer':
 ok, _ = _valid_integer(value)
 if not ok:
-errors.append("%s=%s is not %s" % (param.get('name'), value, type))
+errors.append("%s=%s is not an integer" % (param.get('name'), 
value))
 elif type == 'port':
 ok, ival = _valid_integer(value)
 if not ok:
-errors.append("%s=%s 

commit crmsh for openSUSE:Factory

2015-08-28 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-08-28 08:27:05

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-08-15 
11:39:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-08-28 
08:27:17.0 +0200
@@ -1,0 +2,30 @@
+Wed Aug 26 22:01:24 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1440626270.8872dbc:
+  + low: hb_report: Increase time to wait for the logmark
+  + medium: log_patterns: Remove reference to function name in log patterns 
(bsc#942906)
+  + low: hb_report: Collect libqb version (bsc#943327)
+  + medium: report: Reintroduce empty transition pruning (bsc#943291)
+  + medium: scripts: Ensure that the Filesystem resource exists [nfsserver] 
(bsc#898658)
+  + low: scripts: Make virtual IP optional [nfsserver]
+  + high: scripts: Add force parameter to cib and crm actions, and don't pass 
--force by default
+  + high: scripts: Default to passing --force to crm after all
+  + medium: options: Add --no option
+  + medium: scripts: Use --no option over --force unless force: true is set in 
the script
+  + high: ui_script: Print cached errors in json run
+
+---
+Tue Aug 25 12:53:22 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1440506835.395dad0:
+  + high: report: Update transition edge regexes (bsc#942906)
+  + high: hb_report: Always prefer syslog if available (bsc#942906)
+
+---
+Tue Aug 25 10:35:17 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1440493477.255685f:
+  + low: scripts: Catch attempt to pass dict as parameter value
+  + medium: scripts: Switch install default to false (fate#318482)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1439547680.0877a90.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1440626270.8872dbc.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.az9hc4/_old  2015-08-28 08:27:18.0 +0200
+++ /var/tmp/diff_new_pack.az9hc4/_new  2015-08-28 08:27:18.0 +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.1439547680.0877a90
+Version:2.2.0~rc3+git.1440626270.8872dbc
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.az9hc4/_old  2015-08-28 08:27:18.0 +0200
+++ /var/tmp/diff_new_pack.az9hc4/_new  2015-08-28 08:27:18.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevision0877a90483d83aa98af93af0389701c8a22b01b3/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevision8872dbc78204535d7b544393bef03c7bf485441f/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1439547680.0877a90.tar.bz2 - 
crmsh-2.2.0~rc3+git.1440626270.8872dbc.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1439547680.0877a90/hb_report/hb_report.in 
new/crmsh-2.2.0~rc3+git.1440626270.8872dbc/hb_report/hb_report.in
--- old/crmsh-2.2.0~rc3+git.1439547680.0877a90/hb_report/hb_report.in   
2015-08-14 12:22:33.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1440626270.8872dbc/hb_report/hb_report.in   
2015-08-27 00:01:24.0 +0200
@@ -295,10 +295,6 @@
 #
 findlog() {
local logf=
-   if [ -f $PCMK_LOG ]; then
-   echo $PCMK_LOG
-   return
-   fi
 
if [ $HA_LOGFACILITY ]; then
logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
@@ -308,13 +304,16 @@
return
fi
 
-
-   collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
if [ -f $WORKDIR/$JOURNAL_F ]; then
echo $WORKDIR/$JOURNAL_F
return
fi
 
+   if [ -f $PCMK_LOG ]; then
+   echo $PCMK_LOG
+   return
+   fi
+
echo ${HA_DEBUGFILE:-$HA_LOGFILE}
[ ${HA_DEBUGFILE:-$HA_LOGFILE} ] 
debug will try with ${HA_DEBUGFILE:-$HA_LOGFILE}
@@ -1051,6 +1050,9 @@
local outf
outf=$WORKDIR/$HALOG_F
 
+   # collect journal from systemd
+   collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
+
   

commit crmsh for openSUSE:Factory

2015-08-15 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-08-15 11:39:34

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-08-12 
15:15:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-08-15 
11:39:35.0 +0200
@@ -1,0 +2,10 @@
+Fri Aug 14 10:22:33 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1439547680.0877a90:
+  + low: main: Bash completion didn't handle sudo correctly
+  + high: hb_report: Correct path to hb_report after move to subdirectory 
(bsc#936026)
+  + medium: report: Add pacemaker.log to find_node_log list (bsc#941734)
+  + high: hb_report: Prefer pacemaker.log if it exists (bsc#941681)
+  + high: report: Output format from pacemaker has changed (bsc#941681)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1439305144.fbe773c.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1439547680.0877a90.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.T985lw/_old  2015-08-15 11:39:36.0 +0200
+++ /var/tmp/diff_new_pack.T985lw/_new  2015-08-15 11:39:36.0 +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.1439305144.fbe773c
+Version:2.2.0~rc3+git.1439547680.0877a90
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.T985lw/_old  2015-08-15 11:39:36.0 +0200
+++ /var/tmp/diff_new_pack.T985lw/_new  2015-08-15 11:39:36.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevisionfbe773c2828cf9147fc779a2aab7aa131eac1cfe/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevision0877a90483d83aa98af93af0389701c8a22b01b3/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1439305144.fbe773c.tar.bz2 - 
crmsh-2.2.0~rc3+git.1439547680.0877a90.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1439305144.fbe773c/hb_report/hb_report.in 
new/crmsh-2.2.0~rc3+git.1439547680.0877a90/hb_report/hb_report.in
--- old/crmsh-2.2.0~rc3+git.1439305144.fbe773c/hb_report/hb_report.in   
2015-08-12 09:16:34.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1439547680.0877a90/hb_report/hb_report.in   
2015-08-14 12:22:33.0 +0200
@@ -153,6 +153,7 @@
# NB: they all have to be in syslog format
#
EXTRA_LOGS=/var/log/messages /var/log/pacemaker.log
+   PCMK_LOG=/var/log/pacemaker.log
# used only by the master
NO_SSH=
SSH_USER=
@@ -294,19 +295,29 @@
 #
 findlog() {
local logf=
-   collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
+   if [ -f $PCMK_LOG ]; then
+   echo $PCMK_LOG
+   return
+   fi
+
if [ $HA_LOGFACILITY ]; then
logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
fi
if [ -f $logf ]; then
echo $logf
-   elif [ -f $WORKDIR/$JOURNAL_F ]; then
+   return
+   fi
+
+
+   collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
+   if [ -f $WORKDIR/$JOURNAL_F ]; then
echo $WORKDIR/$JOURNAL_F
-   else
-   echo ${HA_DEBUGFILE:-$HA_LOGFILE}
-   [ ${HA_DEBUGFILE:-$HA_LOGFILE} ] 
-   debug will try with ${HA_DEBUGFILE:-$HA_LOGFILE}
+   return
fi
+
+   echo ${HA_DEBUGFILE:-$HA_LOGFILE}
+   [ ${HA_DEBUGFILE:-$HA_LOGFILE} ] 
+   debug will try with ${HA_DEBUGFILE:-$HA_LOGFILE}
 }
 
 #
@@ -523,12 +534,12 @@
 NODES=$NODES
 MASTER_NODE=$MASTER_NODE
 HA_LOG=$HA_LOG
-MASTER_IS_HOSTLOG=$MASTER_IS_HOSTLOG
 UNIQUE_MSG=$UNIQUE_MSG
 SANITIZE=$SANITIZE
 DO_SANITIZE=$DO_SANITIZE
 SKIP_LVL=$SKIP_LVL
 EXTRA_LOGS=$EXTRA_LOGS
+PCMK_LOG=$PCMK_LOG
 USER_CLUSTER_TYPE=$USER_CLUSTER_TYPE
 CONF=$CONF
 B_CONF=$B_CONF
@@ -552,11 +563,11 @@
dumpenv |
if [ $node = $WE ]; then
debug running: $LOCAL_SUDO hb_report __slave
-   $LOCAL_SUDO ${datadir}/@PACKAGE_NAME@/hb_report __slave
+   $LOCAL_SUDO ${HA_NOARCHBIN}/hb_report __slave
else
debug running: ssh $SSH_OPTS $node \$SUDO hb_report __slave
ssh $SSH_OPTS $node \
-   

commit crmsh for openSUSE:Factory

2015-08-12 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-08-12 15:15:13

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-08-11 
08:26:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-08-12 
15:15:14.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug 12 07:16:35 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1439305144.fbe773c:
+  + medium: config: Add report_tool_options (bsc#917638)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1438934728.5abada2.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1439305144.fbe773c.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.GJJ6w8/_old  2015-08-12 15:15:15.0 +0200
+++ /var/tmp/diff_new_pack.GJJ6w8/_new  2015-08-12 15:15:15.0 +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.1438934728.5abada2
+Version:2.2.0~rc3+git.1439305144.fbe773c
 Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.GJJ6w8/_old  2015-08-12 15:15:15.0 +0200
+++ /var/tmp/diff_new_pack.GJJ6w8/_new  2015-08-12 15:15:15.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevision5abada255a1d0597ea613973339030b49b4cf9e1/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevisionfbe773c2828cf9147fc779a2aab7aa131eac1cfe/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1438934728.5abada2.tar.bz2 - 
crmsh-2.2.0~rc3+git.1439305144.fbe773c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1438934728.5abada2/crm.conf.in 
new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/crm.conf.in
--- old/crmsh-2.2.0~rc3+git.1438934728.5abada2/crm.conf.in  2015-08-10 
09:58:45.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/crm.conf.in  2015-08-12 
09:16:34.0 +0200
@@ -19,6 +19,7 @@
 ; 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 =
 
 [path]
 ; sharedir = detected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/config.py 
new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/config.py
--- old/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/config.py
2015-08-10 09:58:45.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/config.py
2015-08-12 09:16:34.0 +0200
@@ -207,6 +207,7 @@
 'dot': opt_program('', ('dot',)),
 'supported_schemas': opt_list(_SUPPORTED_SCHEMAS),
 'ignore_missing_metadata': opt_boolean('no'),
+'report_tool_options': opt_string('')
 },
 'path': {
 'sharedir': opt_dir('%(datadir)s/crmsh'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/report.py 
new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/report.py
--- old/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/report.py
2015-08-10 09:58:45.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/report.py
2015-08-12 09:16:34.0 +0200
@@ -979,11 +979,12 @@
 if extcmd is None:
 self.error(No reporting tool found)
 return None
-rc = pipe_cmd_nosudo(%s -Z -Q -f '%s' %s %s %s %
+rc = pipe_cmd_nosudo(%s -Z -Q -f '%s' %s %s %s %s %
  (extcmd,
   self.from_dt.ctime(),
   to_option,
   nodes_option,
+  str(config.core.report_tool_options),
   d))
 if rc != 0:
 if os.path.isfile(tarball):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/ui_report.py 
new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/ui_report.py
--- old/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/ui_report.py 
2015-08-10 09:58:45.0 +0200
+++ 

commit crmsh for openSUSE:Factory

2015-08-11 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-08-11 08:26:38

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-07-14 
17:44:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-08-11 
08:26:40.0 +0200
@@ -1,0 +2,7 @@
+Mon Aug 10 07:58:45 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1438934728.5abada2:
+  + Medium: cibconfig: skip sanity check for properties other than 
cib-bootstrap-options
+  + high: parse: Add attributes to terminator set (bsc#940920)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1436439891.2cc4984.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1438934728.5abada2.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.h61Dnx/_old  2015-08-11 08:26:40.0 +0200
+++ /var/tmp/diff_new_pack.h61Dnx/_new  2015-08-11 08:26:40.0 +0200
@@ -36,8 +36,8 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc3+git.1436439891.2cc4984
-Release:0%{?crmsh_release}%{?dist}
+Version:2.2.0~rc3+git.1438934728.5abada2
+Release:0
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

++ _servicedata ++
--- /var/tmp/diff_new_pack.h61Dnx/_old  2015-08-11 08:26:40.0 +0200
+++ /var/tmp/diff_new_pack.h61Dnx/_new  2015-08-11 08:26:40.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevision2cc4984e51e1f9dcd09aa79bc6c4cfb8e2630e5a/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevision5abada255a1d0597ea613973339030b49b4cf9e1/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1436439891.2cc4984.tar.bz2 - 
crmsh-2.2.0~rc3+git.1438934728.5abada2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1436439891.2cc4984/modules/cibconfig.py 
new/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/cibconfig.py
--- old/crmsh-2.2.0~rc3+git.1436439891.2cc4984/modules/cibconfig.py 
2015-07-09 13:12:16.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/cibconfig.py 
2015-08-10 09:58:45.0 +0200
@@ -1879,6 +1879,12 @@
 return utils.get_check_rc()
 l = []
 if self.obj_type == property:
+# don't check property sets which are not
+# cib-bootstrap-options, they are probably used by
+# some resource agents such as mysql to store RA
+# specific state
+if self.obj_id != cib_object_map[self.xml_obj_type][3]:
+return 0
 l = get_properties_list()
 l += constants.extra_cluster_properties
 elif self.obj_type == op_defaults:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc3+git.1436439891.2cc4984/modules/parse.py 
new/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/parse.py
--- old/crmsh-2.2.0~rc3+git.1436439891.2cc4984/modules/parse.py 2015-07-09 
13:12:16.0 +0200
+++ new/crmsh-2.2.0~rc3+git.1438934728.5abada2/modules/parse.py 2015-08-10 
09:58:45.0 +0200
@@ -314,7 +314,7 @@
 _UNARYOP_RE = re.compile(r'(%s)$' % ('|'.join(constants.unary_ops)), 
re.IGNORECASE)
 _BINOP_RE = None
 
-_TERMINATORS = ('params', 'meta', 'utilization', 'operations', 'op', 
'rule')
+_TERMINATORS = ('params', 'meta', 'utilization', 'operations', 'op', 
'rule', 'attributes')
 
 def match_attr_list(self, name, tag, allow_empty=True):
 
@@ -508,6 +508,43 @@
 else:
 return ['score-attribute', score]
 
+def match_arguments(self, out, name_map, implicit_initial=None):
+
+[name attr_list]
+[operations id_spec]
+[op op_type [attribute=value ...] ...]
+
+attr_list :: [$id=id] attr=val [attr=val...] | $id-ref=id
+id_spec :: $id=id | $id-ref=id
+op_type :: start | stop | monitor
+
+implicit_initial: when matching attr lists, if none match at first
+parse an implicit initial token and then continue.
+This is so for example: primitive foo Dummy state=1 is accepted when
+params is the implicit initial.
+
+names = 

commit crmsh for openSUSE:Factory

2015-07-14 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-07-14 17:43:13

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-07-05 
18:03:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-07-14 
17:44:19.0 +0200
@@ -1,0 +2,23 @@
+Thu Jul 09 11:12:16 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1436439891.2cc4984:
+  + high: ui_script: drop end sentinel from API output (fate#318211)
+  + low: scripts: Title and category for exportfs
+  + low: scripts: Strip shortdesc for scripts and params
+  + low: scripts: Tweak description for libvirt
+  + low: scripts: make overridden parameters non-advanced by default
+  + low: scripts: add missing type annotations to libvirt script
+  + low: scripts: Fix formatting for SAP scripts
+  + low: scripts: Clearer shortdesc for filesystem
+  + low: scripts: Preserve formatting of longdescs
+  + medium: ui_script: Add name to action output (fate#318211)
+  + low: ui_script: Check JSON command syntax
+  + medium: ui_script: Fix bug in verify json encoding
+
+---
+Mon Jul 06 05:42:04 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1436110355.d603e20:
+  + low: scripts: Fix possible reference error in agent include
+
+---

Old:

  crmsh-2.2.0~rc3+git.1435949142.a824a98.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1436439891.2cc4984.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Pt50DK/_old  2015-07-14 17:44:20.0 +0200
+++ /var/tmp/diff_new_pack.Pt50DK/_new  2015-07-14 17:44:20.0 +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.1435949142.a824a98
+Version:2.2.0~rc3+git.1436439891.2cc4984
 Release:0%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.Pt50DK/_old  2015-07-14 17:44:20.0 +0200
+++ /var/tmp/diff_new_pack.Pt50DK/_new  2015-07-14 17:44:20.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevisiona824a9868ca953218d70e8d50fe425cf851e052e/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevision2cc4984e51e1f9dcd09aa79bc6c4cfb8e2630e5a/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1435949142.a824a98.tar.bz2 - 
crmsh-2.2.0~rc3+git.1436439891.2cc4984.tar.bz2 ++
 3064 lines of diff (skipped)




commit crmsh for openSUSE:Factory

2015-07-05 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-07-05 18:03:09

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-06-30 
10:16:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-07-05 
18:03:16.0 +0200
@@ -1,0 +2,15 @@
+Fri Jul 03 18:48:00 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1435949142.a824a98:
+  + low: Add HAProxy script to data manifest
+  + low: Remove build revision from version
+  + low: scripts: Clearer error message
+
+---
+Fri Jul 03 18:11:42 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1435679589.07d4206:
+  + medium: scripts: Add HAProxy script
+  + medium: constants: Add 'provides' meta attribute (bsc#936587)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1435265407.2865580.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1435949142.a824a98.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.oXzQOC/_old  2015-07-05 18:03:17.0 +0200
+++ /var/tmp/diff_new_pack.oXzQOC/_new  2015-07-05 18:03:17.0 +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.1435265407.2865580
+Version:2.2.0~rc3+git.1435949142.a824a98
 Release:0%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _service ++
--- /var/tmp/diff_new_pack.oXzQOC/_old  2015-07-05 18:03:17.0 +0200
+++ /var/tmp/diff_new_pack.oXzQOC/_new  2015-07-05 18:03:17.0 +0200
@@ -2,7 +2,6 @@
   service name=tar_scm mode=disabled
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
 param name=scmgit/param
-param name=package-metayes/param
 param name=filenamecrmsh/param
 param name=versionformat2.2.0~rc3+git.%ct.%h/param
 param name=revisionmaster/param

++ _servicedata ++
--- /var/tmp/diff_new_pack.oXzQOC/_old  2015-07-05 18:03:17.0 +0200
+++ /var/tmp/diff_new_pack.oXzQOC/_new  2015-07-05 18:03:17.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevision28655806b302aeeaf76f9634446580aed42fe8ba/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevisiona824a9868ca953218d70e8d50fe425cf851e052e/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1435265407.2865580.tar.bz2 - 
crmsh-2.2.0~rc3+git.1435949142.a824a98.tar.bz2 ++
/work/SRC/openSUSE:Factory/crmsh/crmsh-2.2.0~rc3+git.1435265407.2865580.tar.bz2 
/work/SRC/openSUSE:Factory/.crmsh.new/crmsh-2.2.0~rc3+git.1435949142.a824a98.tar.bz2
 differ: char 11, line 1




commit crmsh for openSUSE:Factory

2015-06-30 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-06-30 10:16:24

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-06-15 
17:49:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-06-30 
10:16:26.0 +0200
@@ -1,0 +2,13 @@
+Thu Jun 25 20:50:46 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc3+git.1435265407.2865580:
+  + high: hb_report: find utility scripts after move (bsc#936026)
+  + high: ui_report: Move hb_report to subdirectory (bsc#936026)
+  + high: scripts: subscript values not required if subscript has no 
parameters / all defaults (fate#318211)
+  + high: Makefile: Don't unstall hb_report using data-manifest (bsc#936026)
+  + medium: scripts: Fix name override for subscripts (fate#318211)
+  + medium: scripts: stop inserting comments as values
+  + medium: report: Fall back to cluster-glue hb_report if necessary 
(bsc#936026)
+  + low: scripts: Clean up generated CIB (fate#318211)
+
+---

Old:

  crmsh-2.2.0~rc3+git.1434151485.7365522.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1435265407.2865580.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.zEnbpX/_old  2015-06-30 10:16:27.0 +0200
+++ /var/tmp/diff_new_pack.zEnbpX/_new  2015-06-30 10:16:27.0 +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.1434151485.7365522
+Version:2.2.0~rc3+git.1435265407.2865580
 Release:0%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.zEnbpX/_old  2015-06-30 10:16:27.0 +0200
+++ /var/tmp/diff_new_pack.zEnbpX/_new  2015-06-30 10:16:27.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevision7365522b9d445ea0721f4fce8d1e4c3d8ef7655f/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevision28655806b302aeeaf76f9634446580aed42fe8ba/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc3+git.1434151485.7365522.tar.bz2 - 
crmsh-2.2.0~rc3+git.1435265407.2865580.tar.bz2 ++
/work/SRC/openSUSE:Factory/crmsh/crmsh-2.2.0~rc3+git.1434151485.7365522.tar.bz2 
/work/SRC/openSUSE:Factory/.crmsh.new/crmsh-2.2.0~rc3+git.1435265407.2865580.tar.bz2
 differ: char 11, line 1




commit crmsh for openSUSE:Factory

2015-06-15 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-06-15 17:49:12

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-06-06 
09:54:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-06-15 
17:49:16.0 +0200
@@ -1,0 +2,71 @@
+Fri Jun 12 23:32:12 UTC 2015 - kgronl...@suse.com
+
+- Pre-release 2.2.0-rc3
+- high: Merge rewizards development branch (fate#318211)
+  (fate#318384) (fate#318483) (fate#318482) (fate#318550)
+
+- Summary of some of the changes included in the merge of
+  the rewizards branch:
+  + Colorized status output
+  + New and more capable cluster script implementation
+  + Deprecated the crmsh templates (not the CIB templates,
+the configuration templates)
+  + Implemented a JSON API interface to the cluster scripts
+for hawk to use instead of having its own wizards
+  + Handlebars-like templating language for cluster scripts
+that modify the CIB
+  + Collect metadata from resource agents to avoid duplication
+in configuration scripts
+  + Extended validation support for parameter values
+  + New cluster scripts:
+
+   - Stonith: SBD and libvirt
+   - Apache web server
+   - NFS server
+   - cLVM
+   - Databases: MySQL / MariaDB / Oracle / DB2
+   - SAP
+   - OCFS2
+   - etc.
+
+  + Radically simplified automake and autoconf setup
+  + Improved completion performance
+  + Added pygment lexers used by the history guide as stand-alone
+python module in contrib/
+  + Removed dependency on corosync for regression test suite
+  + Sort topics and commands in help output
+  + Hide internal commands in help and ls
+  + Clearer debug output when simulating
+  + Cleaned up and fixed documentation bugs
+
+- Update to version 2.2.0~rc3+git.1434151485.7365522:
+  + low: crm: Detect and report use of python 3
+  + medium: hb_report: Collect logs from pacemaker.log
+  + medium: ui_root: Make the cibstatus command available directly from the 
root
+  + medium: resource: Add ban command
+  + medium: handles: {{^feature}}invert blocks{{/feature}}
+  + medium: handles: Replace magic value with callables
+  + low: handles: Also allow # and $ in identifiers
+  + doc: Update reference to parallax in scripts documentation
+  + WIP: in-progress notes etc.
+  + scripts: Add placeholders for some basic scripts
+  + medium: handles: Fix error in strict parameter handling
+  + medium: config: add config.path.hawk_wizards
+  + medium: ui_script: Add JSON API
+  + build: Add update-data-manifest.sh to generate datadir file list
+  + contrib: Add pygment lexers used by the history guide
+  + doc: Describe website compilation process in development.md
+  + doc: scripts: Basic documentation for the cluster scripts
+  + medium: help: Sort topics and commands in help output
+  + low: handles: Clean up special values
+  + doc: Document the script JSON API
+  + low: script: Rename describe to show
+  + low: command: Hide internal commands from ls
+  + doc: Fix unterminated block
+  + low: scripts: Stricter regexp for identifiers
+  + low: scripts: Handle local runs even if nodelist doesn't contain local node
+  + low: cmd_status: Add full argument to status
+  + high: cmd_status: Colorize status output
+  + Pre-release 2.2.0-rc3
+
+---

Old:

  crmsh-2.2.0~rc2+git.1432560022.4e7baf3.tar.bz2

New:

  crmsh-2.2.0~rc3+git.1434151485.7365522.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ddnJzA/_old  2015-06-15 17:49:17.0 +0200
+++ /var/tmp/diff_new_pack.ddnJzA/_new  2015-06-15 17:49:17.0 +0200
@@ -36,12 +36,13 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc2+git.1432560022.4e7baf3
+Version:2.2.0~rc3+git.1434151485.7365522
 Release:0%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  pacemaker
+Requires:   %{name}-scripts = %{version}-%{release}
 Requires:   /usr/bin/which
 Requires:   python = 2.6
 Requires:   python-dateutil
@@ -86,8 +87,6 @@
 configuration, management and troubleshooting of Pacemaker-based
 clusters, by providing a powerful and intuitive set of features.
 
-Authors: Dejan Muhamedagic de...@suse.de and many others
-
 %package test
 Summary:Test package for crmsh
 Group:  %{pkg_group}
@@ -96,6 +95,7 @@
 BuildRequires:  procps
 

commit crmsh for openSUSE:Factory

2015-06-06 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-06-06 09:54:22

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-05-25 
23:14:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-06-06 
09:54:28.0 +0200
@@ -1,0 +2,5 @@
+Fri May 29 09:09:03 UTC 2015 - kgronl...@suse.com
+
+- Remove unnecessary dependency on corosync for regression test suite 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.1099Hg/_old  2015-06-06 09:54:29.0 +0200
+++ /var/tmp/diff_new_pack.1099Hg/_new  2015-06-06 09:54:29.0 +0200
@@ -93,7 +93,6 @@
 Group:  %{pkg_group}
 Requires:   crmsh
 %if 0%{?with_regression_tests}
-BuildRequires:  corosync
 BuildRequires:  procps
 BuildRequires:  python-dateutil
 BuildRequires:  python-nose




commit crmsh for openSUSE:Factory

2015-05-14 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-05-15 07:44:07

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-04-27 
13:05:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-05-15 
07:44:34.0 +0200
@@ -1,0 +2,13 @@
+Wed May 13 13:11:43 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc2+git.1431438882.ae4b493:
+  + doc: Update the documentation for the upgrade command
+  + high: ui_cluster: Add copy command
+  + low: schema: Don't leak PacemakerError exceptions (#93)
+  + Fix CFLAGS for supporting triplet paths with pacemaker
+  + medium: ui_configure: Wait for DC when removing running resource
+  + Medium: hb_report: use faster zypper interface if available
+  + Low: doc: simplify to make it work with python 2.6
+  + Medium: doc: add history guide
+
+---

Old:

  crmsh-2.2.0~rc2+git.1429973374.667891c.tar.bz2

New:

  crmsh-2.2.0~rc2+git.1431438882.ae4b493.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.GmsPbH/_old  2015-05-15 07:44:35.0 +0200
+++ /var/tmp/diff_new_pack.GmsPbH/_new  2015-05-15 07:44:35.0 +0200
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc2+git.1429973374.667891c
+Version:2.2.0~rc2+git.1431438882.ae4b493
 Release:0%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.GmsPbH/_old  2015-05-15 07:44:35.0 +0200
+++ /var/tmp/diff_new_pack.GmsPbH/_new  2015-05-15 07:44:35.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevision667891c4a824eefc22aa1e15453a9433d77eab98/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevisionae4b4937abeef5271d92957ee3aec8f74630e0a0/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc2+git.1429973374.667891c.tar.bz2 - 
crmsh-2.2.0~rc2+git.1431438882.ae4b493.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh-2.2.0~rc2+git.1429973374.667891c/configure.ac 
new/crmsh-2.2.0~rc2+git.1431438882.ae4b493/configure.ac
--- old/crmsh-2.2.0~rc2+git.1429973374.667891c/configure.ac 2015-04-26 
12:46:49.0 +0200
+++ new/crmsh-2.2.0~rc2+git.1431438882.ae4b493/configure.ac 2015-05-13 
15:11:43.0 +0200
@@ -109,6 +109,7 @@
 eval sysconfdir=`eval echo ${sysconfdir}`
 eval sharedstatedir=`eval echo ${sharedstatedir}`
 eval localstatedir=`eval echo ${localstatedir}`
+eval includedir=`eval echo ${includedir}`
 eval libdir=`eval echo ${libdir}`
 eval infodir=`eval echo ${infodir}`
 eval mandir=`eval echo ${mandir}`
@@ -123,7 +124,7 @@
 fi
 AC_SUBST(docdir)
 
-CFLAGS=$CFLAGS -I${prefix}/include/heartbeat -I${prefix}/include/pacemaker
+CFLAGS=$CFLAGS -I${prefix}/include/heartbeat -I${includedir}/heartbeat 
-I${prefix}/include/pacemaker -I${includedir}/pacemaker
 
 for j in prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir \
 sharedstatedir localstatedir libdir infodir \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc2+git.1429973374.667891c/doc/crm.8.adoc 
new/crmsh-2.2.0~rc2+git.1431438882.ae4b493/doc/crm.8.adoc
--- old/crmsh-2.2.0~rc2+git.1429973374.667891c/doc/crm.8.adoc   2015-04-26 
12:46:49.0 +0200
+++ new/crmsh-2.2.0~rc2+git.1431438882.ae4b493/doc/crm.8.adoc   2015-05-13 
15:11:43.0 +0200
@@ -933,6 +933,24 @@
 run cat /proc/uptime
 ...
 
+[[cmdhelp_cluster_copy,Copy file to other cluster nodes]]
+ `copy`
+
+Copy file to other cluster nodes.
+
+Copies the given file to all other nodes unless given a
+list of nodes to copy to as argument.
+
+Usage:
+...
+copy filename [nodes ...]
+...
+
+Example:
+...
+copy /etc/motd
+...
+
 [[cmdhelp_cluster_start,Start cluster services]]
  `start`
 
@@ -3549,25 +3567,28 @@
 template two-apaches.txt
 ...
 
-[[cmdhelp_configure_upgrade,upgrade the CIB to version 1.0]]
+[[cmdhelp_configure_upgrade,upgrade the CIB]]
  `upgrade`
 
-If you get the `CIB not supported` error, which typically means
-that the current CIB version is coming from the older release,

commit crmsh for openSUSE:Factory

2015-04-27 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-04-27 13:05:02

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-04-21 
10:53:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-04-27 
13:05:03.0 +0200
@@ -1,0 +2,7 @@
+Sun Apr 26 10:46:49 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc2+git.1429973374.667891c:
+  + dev: Convert to relative imports
+  + parse: Don't require trailing colon in tag definitions
+
+---

Old:

  crmsh-2.2.0~rc2+git.1429514909.aaf77a6.tar.bz2

New:

  crmsh-2.2.0~rc2+git.1429973374.667891c.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.dkydhz/_old  2015-04-27 13:05:04.0 +0200
+++ /var/tmp/diff_new_pack.dkydhz/_new  2015-04-27 13:05:04.0 +0200
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc2+git.1429514909.aaf77a6
+Version:2.2.0~rc2+git.1429973374.667891c
 Release:0%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.dkydhz/_old  2015-04-27 13:05:04.0 +0200
+++ /var/tmp/diff_new_pack.dkydhz/_new  2015-04-27 13:05:04.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevisionaaf77a6a883d5a6fb2e798769aea8cafd1b31a74/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevision667891c4a824eefc22aa1e15453a9433d77eab98/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc2+git.1429514909.aaf77a6.tar.bz2 - 
crmsh-2.2.0~rc2+git.1429973374.667891c.tar.bz2 ++
 1808 lines of diff (skipped)




commit crmsh for openSUSE:Factory

2015-04-21 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-04-21 10:53:32

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-04-10 
10:20:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-04-21 
10:53:41.0 +0200
@@ -1,0 +2,15 @@
+Mon Apr 20 11:39:55 UTC 2015 - opensuse-packag...@opensuse.org
+
+- Update to version 2.2.0~rc2+git.1429514909.aaf77a6:
+  + high: crm_pssh: Explicitly set parallax inline option (krig/parallax#1)
+
+---
+Mon Apr 13 07:39:26 UTC 2015 - kgronl...@suse.com
+
+- Update to version 2.2.0~rc2+git.1428866384.7e5832c:
+  + low: ui_options: add alias list for show
+  + low: hb_report: Use crmsh config to find pengine/cib dirs (bsc#926377)
+  + medium: utils: Allow 1/0 as boolean values for parameters
+  + high: ui_configure: Add show-property command
+
+---

Old:

  crmsh-2.2.0~rc2+git.1427980503.0475bf7.tar.bz2

New:

  crmsh-2.2.0~rc2+git.1429514909.aaf77a6.tar.bz2



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.MCvykd/_old  2015-04-21 10:53:42.0 +0200
+++ /var/tmp/diff_new_pack.MCvykd/_new  2015-04-21 10:53:42.0 +0200
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc2+git.1427980503.0475bf7
+Version:2.2.0~rc2+git.1429514909.aaf77a6
 Release:0%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:%{name}-%{version}.tar.bz2

++ _servicedata ++
--- /var/tmp/diff_new_pack.MCvykd/_old  2015-04-21 10:53:42.0 +0200
+++ /var/tmp/diff_new_pack.MCvykd/_new  2015-04-21 10:53:42.0 +0200
@@ -1,4 +1,4 @@
 servicedata
 service name=tar_scm
 param name=urlgit://github.com/ClusterLabs/crmsh.git/param
-  param 
name=changesrevision0475bf7a34557c88852a9d1f81b82781cafa487c/param/service/servicedata
\ No newline at end of file
+  param 
name=changesrevisionaaf77a6a883d5a6fb2e798769aea8cafd1b31a74/param/service/servicedata
\ No newline at end of file

++ crmsh-2.2.0~rc2+git.1427980503.0475bf7.tar.bz2 - 
crmsh-2.2.0~rc2+git.1429514909.aaf77a6.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc2+git.1427980503.0475bf7/doc/crm.8.adoc 
new/crmsh-2.2.0~rc2+git.1429514909.aaf77a6/doc/crm.8.adoc
--- old/crmsh-2.2.0~rc2+git.1427980503.0475bf7/doc/crm.8.adoc   2015-04-02 
16:01:48.0 +0200
+++ new/crmsh-2.2.0~rc2+git.1429514909.aaf77a6/doc/crm.8.adoc   2015-04-20 
13:39:55.0 +0200
@@ -3461,7 +3461,12 @@
 
 Usage:
 ...
-show [xml] [id | changed | type:type | tag:id | related:obj ...]
+show [xml] [id
+   | changed
+   | type:type
+   | tag:id
+   | related:obj
+   ...]
 
 type :: node | primitive | group | clone | ms | rsc_template
   | location | colocation | order
@@ -3480,6 +3485,34 @@
 show related:webapp
 ...
 
+[[cmdhelp_configure_show_property,Show property value]]
+ `show-property`
+
+Show the value of the given property. If the value is not set, the
+command will print the default value for the property, if known.
+
+If no property name is passed to the command, the list of known
+cluster properties is printed.
+
+If the property is set multiple times, for example using multiple
+property sets with different rule expressions, the output of this
+command is undefined.
+
+Pass the argument +-t+ or +--true+ to `show-property` to translate
+the argument value into +true+ or +false+. If the value is not
+set, the command will print +false+.
+
+Usage:
+...
+show-property [-t|--true] [name]
+...
+
+Example:
+...
+show-property stonith-enabled
+show-property -t maintenance-mode
+...
+
 [[cmdhelp_configure_tag,Define resource tags]]
  `tag`
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-2.2.0~rc2+git.1427980503.0475bf7/doc/website-v1/index.adoc 
new/crmsh-2.2.0~rc2+git.1429514909.aaf77a6/doc/website-v1/index.adoc
--- old/crmsh-2.2.0~rc2+git.1427980503.0475bf7/doc/website-v1/index.adoc
2015-04-02 16:01:48.0 +0200
+++ new/crmsh-2.2.0~rc2+git.1429514909.aaf77a6/doc/website-v1/index.adoc
2015-04-20 13:39:55.0 +0200
@@ -16,4 +16,9 @@
 
 For more information, see the 

commit crmsh for openSUSE:Factory

2015-03-09 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-03-09 10:09:21

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-01-29 
09:56:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-03-09 
10:09:34.0 +0100
@@ -1,0 +2,36 @@
+Thu Mar  5 09:59:59 UTC 2015 - kgronl...@suse.com
+
+- Update to upstream cs: 2.2.0-rc2-101-ge971f44
+  - medium: ui_cluster: Add diff command (bnc#914525)
+  - medium: parse: nvpair attributes with no value = nvpair name=../ (#71)
+  - medium: parse: Encode unicode using xmlcharrefreplace in parser
+  - medium: cibconfig: add show related:obj
+  - medium: report: Convert RE exception to simpler UI output
+  - doc: Documentation for show related:obj
+  - medium: xmlutil: Improved check for related elements
+  - medium: report: Include transitions with configuration changes (bnc#917131)
+  - medium: config: Fix case-sensitivity for booleans
+  - medium: ra: Handle non-OCF agent meta-data better
+  - Medium: cibconf: preserve cib user attributes
+  - medium: cibconfig: Fix inverted logic causing spurious warning
+  - low: cibconfig: Improved debug output when schema change fails
+  - medium: parse: Treat pacemaker-next schema as 2.0+
+  - medium: schema: Test if node type is optional via schema
+  - medium: schema: Remove extra debug output
+  - low: pacemaker: Remove debug output
+  - medium: cibconfig: If a change results in no diff, exit silently
+  - medium: cibconfig: Allow delete of objects that don't exist without 
returning error code
+  - medium: cibconfig: Allow removal of non-existing elements if --force is set
+  - low: allow (0,1) as option booleans
+  - low: allow pacemaker 1.0 version detection
+  - fix: catch exception if schema file does not exist
+  - Low: hb_report: add -Q to usage
+  - Low: hb_report: add -X option for extra ssh options
+  - doc: Move the main crmsh repository to the ClusterLabs organization on 
github
+  - low: ui_context: Use true command name when reporting errors
+  - medium: command: Fuzzy match command names
+  - low: command: Use fuzzy match for sublevel check
+  - doc: Describe the shorthand syntax for commands
+  - medium: help: Teach help to fuzzy match topics
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.KqvQWk/_old  2015-03-09 10:09:35.0 +0100
+++ /var/tmp/diff_new_pack.KqvQWk/_new  2015-03-09 10:09:35.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package crmsh
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc2+git48.ge8853fe
+Version:2.2.0~rc2+git101.ge971f44
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2
@@ -175,7 +175,7 @@
result2=$?
[ $result1 -ne 0 ]  (echo Regression tests failed.; cat 
${buildroot}/crmtestout/regression.out)
[ $result2 -ne 0 ]  echo CIB tests failed.
-   [ $result1 -ne 0 -o $result2 -ne 0 ]  exit 1
+   [ $result1 -eq 0 -a $result2 -eq 0 ]
 fi
 %endif
 

++ crmsh.tar.bz2 ++
 1847 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2015-01-29 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-01-29 09:56:23

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-01-23 
15:47:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-01-29 
09:56:26.0 +0100
@@ -1,0 +2,19 @@
+Tue Jan 27 14:38:54 UTC 2015 - kgronl...@suse.com
+
+- medium: crm_pssh: Handle incomplete Option argument
+- medium: constants: Fix transition start detection
+- medium: crm_pssh: Make tar follow symlinks
+- medium: cibconfig: Strip digest from v1 diffs (bnc#914098)
+- low: ui_options: Add underscore aliases for legacy options
+- medium: constants: Update transition regex (#77)
+- medium: cibconfig: Detect v1 format and don't patch container changes 
(bnc#914098)
+- medium: orderedset: Add OrderedSet type
+- medium: cibconfig: Use orderedset to avoid reordering bugs (#79)
+- medium: xmlutil: Modify sort order of object types
+- low: xmlutil: logic bug in sanity_check_nvpairs
+- high: xmlutil: Treat node type=member as normal (boo#904698)
+- medium: util: Don't fall back to current time
+- medium: report: Fall back to end_ts = start_ts
+- upstream cs: 2.2.0-rc2-48-ge8853fe
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.kRSHMP/_old  2015-01-29 09:56:27.0 +0100
+++ /var/tmp/diff_new_pack.kRSHMP/_new  2015-01-29 09:56:27.0 +0100
@@ -36,7 +36,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc2
+Version:2.2.0~rc2+git48.ge8853fe
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/Makefile.am new/crmsh/Makefile.am
--- old/crmsh/Makefile.am   2015-01-15 17:51:37.0 +0100
+++ new/crmsh/Makefile.am   2015-01-26 11:13:52.0 +0100
@@ -67,7 +67,7 @@
 testdir=   $(datadir)/$(PACKAGE)/tests
 test_SCRIPTS   =   test/regression.sh test/evaltest.sh test/cib-tests.sh
 test_DATA  =   test/README.regression test/defaults test/descriptions \
-   test/crm-interface test/history-test.tar.bz2
+   test/crm-interface test/history-test.tar.bz2 
test/bugs-test.txt
 
 testcasesdir   =   $(datadir)/$(PACKAGE)/tests/testcases
 testcases_SCRIPTS  =   test/testcases/ra.filter 
test/testcases/common.filter test/testcases/xmlonly.sh 
test/testcases/history.pre test/testcases/history.post
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh/doc/website-v1/news/2015-01-26-release-2_1_2.adoc 
new/crmsh/doc/website-v1/news/2015-01-26-release-2_1_2.adoc
--- old/crmsh/doc/website-v1/news/2015-01-26-release-2_1_2.adoc 1970-01-01 
01:00:00.0 +0100
+++ new/crmsh/doc/website-v1/news/2015-01-26-release-2_1_2.adoc 2015-01-26 
11:13:52.0 +0100
@@ -0,0 +1,69 @@
+Announcing crmsh release 2.1.2
+==
+:Author: Kristoffer Gronlund
+:Email: kgronl...@suse.com
+:Date: 2015-01-26 11:05
+
+Today we are proud to announce the release of `crmsh` version 2.1.2!
+This version primarily fixes all known issues found since the release
+of `crmsh` 2.1.1 in October. We recommend that all users of crmsh upgrade
+to this version, especially if using Pacemaker 1.1.12 or newer.
+
+A massive thank you to everyone who has helped out with bug fixes,
+comments and contributions for this release!
+
+For a complete list of changes since the previous version, please
+refer to the changelog:
+
+* https://github.com/crmsh/crmsh/blob/2.1.2/ChangeLog
+
+Packages for several popular Linux distributions can be downloaded
+from the Stable repository at the OBS:
+
+* http://download.opensuse.org/repositories/network:/ha-clustering:/Stable/
+
+Archives of the tagged release:
+
+* https://github.com/crmsh/crmsh/archive/2.1.2.tar.gz
+* https://github.com/crmsh/crmsh/archive/2.1.2.zip
+
+Changes since the previous release:
+
+ - medium: ui_resource: Set probe interval 0 if not set (bnc#905050)
+ - doc: Document probe op in resource trace (bnc#905050)
+ - high: config: Fix path to system-wide crm.conf (#67)
+ - medium: config: Fall back to /etc/crm/crmsh.conf (#67)
+ - low: cliformat: Colorize id: as identifier (boo#905338)
+ - medium: cibconfig: Don't bump epoch if stripping version
+ - medium: 

commit crmsh for openSUSE:Factory

2015-01-23 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-01-23 15:47:26

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-01-09 
20:50:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-01-23 
15:47:33.0 +0100
@@ -1,0 +2,17 @@
+Thu Jan 15 16:54:07 UTC 2015 - kgronl...@suse.com
+
+- Medium: history: match error/crit messages of pcmk 1.1.12
+- medium: cibconfig: Break infinite edit loop if --force is set
+- high: crm_pssh: Use correct Task API in do_pssh (bnc#913261) 
+
+---
+Wed Jan 14 01:25:29 UTC 2015 - kgronl...@suse.com
+
+- medium: utils: crm_daemon_dir is added to PATH in envsetup (#67)
+- medium: config: Add 2.3 to list of supported schemas
+- low: msg: Add note on modifying supported schemas
+- low: config: Convert NoOptionError to ValueError
+- high: utils: Locate binaries across sudo boundary (bnc#912483)
+- Require /usr/bin/which, not which (bnc#912944) 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.nlCh2F/_old  2015-01-23 15:47:35.0 +0100
+++ /var/tmp/diff_new_pack.nlCh2F/_new  2015-01-23 15:47:35.0 +0100
@@ -42,11 +42,11 @@
 Source0:crmsh.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  pacemaker
+Requires:   /usr/bin/which
 Requires:   python = 2.6
 Requires:   python-dateutil
 Requires:   python-lxml
 Requires:   python-parallax
-Requires:   which
 BuildRequires:  python-lxml
 BuildRequires:  python-setuptools
 
@@ -168,16 +168,14 @@
 %post test
 if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
 touch /tmp/.crmsh_regression_tests_ran
-if ! %{_datadir}/%{name}/tests/regression.sh ; then
-echo Regression tests failed.
-cat crmtestout/regression.out
-exit 1
-fi
+   %{_datadir}/%{name}/tests/regression.sh
+   result1=$?
cd %{_datadir}/%{name}/tests
-   if ! ./cib-tests.sh ; then
-   echo CIB tests failed.
-   exit 1
-   fi
+   ./cib-tests.sh
+   result2=$?
+   [ $result1 -ne 0 ]  (echo Regression tests failed.; cat 
${buildroot}/crmtestout/regression.out)
+   [ $result2 -ne 0 ]  echo CIB tests failed.
+   [ $result1 -ne 0 -o $result2 -ne 0 ]  exit 1
 fi
 %endif
 

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/Makefile.am new/crmsh/Makefile.am
--- old/crmsh/Makefile.am   2015-01-09 10:13:19.0 +0100
+++ new/crmsh/Makefile.am   2015-01-15 17:51:37.0 +0100
@@ -78,7 +78,8 @@
test/testcases/confbasic-xml.exp test/testcases/confbasic.exp 
test/testcases/delete.exp test/testcases/file.exp \
test/testcases/node.exp test/testcases/ra.exp 
test/testcases/resource.exp test/testcases/shadow.exp test/testcases/acl.exp 
test/testcases/options.exp \
test/testcases/edit.exp test/testcases/rset.exp 
test/testcases/rset-xml.exp test/testcases/history.exp 
test/testcases/history.excl \
-   test/testcases/newfeatures test/testcases/newfeatures.exp 
test/testcases/acl.excl test/testcases/commit test/testcases/commit.exp
+   test/testcases/newfeatures test/testcases/newfeatures.exp 
test/testcases/acl.excl test/testcases/commit test/testcases/commit.exp \
+   test/testcases/bugs test/testcases/bugs.exp
 
 test/testcases/confbasic-xml.filter:
ln test/testcases/xmlonly.sh $@
@@ -124,8 +125,9 @@
--verbose)
 
 install-exec-local:
+   -mkdir -p $(DESTDIR)$(pkgpythondir)
$(PYTHON) $(srcdir)/setup.py install \
-   --root=${DESTDIR} --prefix=${prefix} \
+   --prefix=$(DESTDIR)$(prefix) \
--record $(DESTDIR)$(pkgpythondir)/install_files.txt \
--verbose
$(INSTALL) -d -m 770 $(DESTDIR)/$(CRM_CACHE_DIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/crmsh.spec new/crmsh/crmsh.spec
--- old/crmsh/crmsh.spec2015-01-09 10:13:19.0 +0100
+++ new/crmsh/crmsh.spec2015-01-15 17:51:37.0 +0100
@@ -46,7 +46,7 @@
 Requires:   python-dateutil
 Requires:   python-lxml
 Requires:   python-parallax
-Requires:   which
+Requires:   /usr/bin/which
 BuildRequires:  python-lxml
 BuildRequires:  python-setuptools
 
@@ -168,16 +168,14 @@
 %post test
 if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
 

commit crmsh for openSUSE:Factory

2015-01-09 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2015-01-09 20:50:50

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  2014-11-24 
11:15:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-01-09 
20:50:58.0 +0100
@@ -1,0 +2,46 @@
+Fri Jan  9 09:29:11 UTC 2015 - kgronl...@suse.com
+
+- Pre-release 2.2.0-rc2
+- medium: ui_resource: Set probe interval 0 if not set (bnc#905050)
+- doc: Document probe op in resource trace (bnc#905050)
+- low: ui_resource: --reprobe and --refresh are deprecated (bnc#905092)
+- doc: Document deprecation of refresh and reprobe (bnc#905092)
+- medium: parse: Support resource-discovery in location constraints
+- medium: pacemaker: Support pacemaker-next as schema
+- medium: cibconfig: Allow unsupported schemas with warning
+- medium: ra: Use correct path for crmd (#67)
+- medium: cmd_status: Show pending if available, enable extra options
+- high: config: Fix path to system-wide crm.conf (#67)
+- medium: config: Fall back to /etc/crm/crmsh.conf (#67)
+- low: cliformat: Colorize id: as identifier (boo#905338)
+- medium: cibconfig: Revised CIB schema handling
+- medium: ui_configure: Add replace option to commit
+- medium: cibconfig: Don't bump epoch if stripping version
+- medium: ui_context: Lazily import readline
+- medium: ui_configure: selectors in save command
+- medium: config: Add core.ignore_missing_metadata (#68) (boo#905910)
+- Medium: config: add alwayscolor to display output option
+- doc: Clarify documentation for property (boo#905637)
+- doc: Add documentation section describing rule expressions (boo#905637)
+- doc: Link to documentation on rule expressions
+- medium: Allow removing groups even if is_running (boo#905271)
+- medium: cibconfig: Delete containers first in edits (boo#905268)
+- doc: Improved documentation for show and save
+- doc: Add note about modeline for vim syntax
+- medium: ui_history: Fix crash using empty object set
+- utils: append_file: open destination in append-mode (boo#907528)
+- medium: parse: Allow nvpair with no value using name= syntax (#71)
+- medium: parse: Enable name[=value] for nvpair (#71)
+- Low: term: get rid of annying ^O in piped-to-less-R output
+- high: parse: Implicit initial parameter list
+- high: crm_pssh: Switch to python-parallax over pssh (bnc#905116)
+- low: report: Fix references to PSSH
+- low: report: Delay Report creation until use
+- medium: utils: Check if path basename is less (#74)
+- medium: ui_options: Accept prefix or suffix of option as argument
+- medium: Remove CIB version in case no --no-version.
+- low: cibconfig: Use LXML to remove version data more robustly (#75)
+- low: crm_gv: Avoid crashing if passed None in my_edge
+- low: cibconfig: Protect against dereferencing None when building graph
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.SjG42E/_old  2015-01-09 20:50:59.0 +0100
+++ /var/tmp/diff_new_pack.SjG42E/_new  2015-01-09 20:50:59.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package crmsh
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,41 +30,32 @@
 %define pkg_group Productivity/Clustering/HA
 %endif
 
-# Compatibility macros for distros (fedora) that don't provide Python macros 
by default
-# Do this instead of trying to conditionally include 
{_rpmconfigdir}/macros.python
-%{!?py_ver: %{expand: %%global py_ver  %%(echo `python -c import sys; 
print sys.version[:3]`)}}
-%{!?py_prefix:  %{expand: %%global py_prefix   %%(echo `python -c import sys; 
print sys.prefix`)}}
-%{!?py_libdir:  %{expand: %%global py_libdir   
%%{expand:{py_prefix}/{_lib}/python{py_ver
-%{!?py_sitedir: %{expand: %%global py_sitedir  
%%{expand:{py_libdir}/site-packages}}}
+%{!?python_sitelib: %define python_sitelib %(python -c from 
distutils.sysconfig import get_python_lib; print get_python_lib())}
 
 Name:   crmsh
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.2.0~rc1
+Version:2.2.0~rc2
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 

commit crmsh for openSUSE:Factory

2014-11-24 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-11-24 11:15:42

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  2014-10-29 
21:11:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-11-24 
11:15:43.0 +0100
@@ -1,0 +2,6 @@
+Wed Nov 12 16:03:10 UTC 2014 - kgronl...@suse.com
+
+- PyYAML is not a build dependency
+  - Remove BuildRequires: python-PyYAML 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.YfMuEd/_old  2014-11-24 11:15:44.0 +0100
+++ /var/tmp/diff_new_pack.YfMuEd/_new  2014-11-24 11:15:44.0 +0100
@@ -56,7 +56,6 @@
 
 %if 0%{?suse_version}
 Requires:   python-PyYAML
-BuildRequires:  python-PyYAML
 # Suse splits this off into a separate package
 Requires:   python-curses
 BuildRequires:  fdupes
@@ -70,7 +69,6 @@
 
 %if 0%{?fedora_version}
 Requires:   PyYAML
-BuildRequires:  PyYAML
 %endif
 
 # Required for core functionality

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-10-29 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-10-29 21:10:29

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  2014-10-18 
09:10:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-10-29 
21:11:28.0 +0100
@@ -1,0 +2,15 @@
+Tue Oct 28 22:54:01 UTC 2014 - kgronl...@suse.com
+
+- Pre-release 2.2.0-rc1
+- Updated changelog
+
+---
+Tue Oct 28 20:56:39 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_resource: Only act on resources (#64)
+- medium: ui_resource: Flatten, then filter (#64)
+- high: ui_resource: Use correct name for error function (bnc#901453)
+- high: ui_resource: resource trace failed if operation existed (bnc#901453)
+- upstream cs: 2.1.0-114-gd51bf56 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ypr63I/_old  2014-10-29 21:11:29.0 +0100
+++ /var/tmp/diff_new_pack.ypr63I/_new  2014-10-29 21:11:29.0 +0100
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git108
+Version:2.2.0~rc1
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/ChangeLog new/crmsh/ChangeLog
--- old/crmsh/ChangeLog 2014-10-17 17:46:44.0 +0200
+++ new/crmsh/ChangeLog 2014-10-28 23:50:46.0 +0100
@@ -1,3 +1,54 @@
+* Tue Oct 28 2014 Kristoffer Grönlund kgronl...@suse.com and many others
+- Pre-release 2.2.0-rc1
+- cibconfig: Clean up output from crm_verify (bnc#893138)
+- high: constants: Add acl_target and acl_group to cib_cli_map (bnc#894041)
+- medium: cibconfig: Add set command
+- doc: Rename asciidoc files to %.adoc
+- high: parse: split shortcuts into valid rules
+- medium: Handle broken CIB in find_objects
+- high: scripts: Handle corosync.conf without nodelist in add-node (bnc#862577)
+- low: template: Add 'new template' shortcut
+- low: ui_configure: add rm as alias for delete
+- low: ui_template: List both templates and configs by default
+- medium: config: Assign default path in all cases
+- low: main: Catch any ValueErrors that may leak through
+- doc: Update TODO
+- low: corosync: Check tools before use
+- low: ui_ra: Don't crash when no OCF agents installed
+- low: ra: Add systemd-support to RaOS
+- doc: Updated documentation
+- doc: Handle command names with underscore
+- doc: Add tool to sort command list in documentation
+- doc: Sort command list in documentation alphabetically
+- high: cibconfig: Generate valid CLI syntax for attribute lists (bnc#897462)
+- high: cibconfig: Add tag:tag to get all resources in tag
+- low: report: Sort list of nodes
+- low: ui_cluster: More informative error message
+- low: main: Replace getopt with optparse
+- high: parse: Allow empty attribute values in nvpairs (bnc#898625)
+- high: ui_maintenance: Add maintenance sublevel (bnc#899234)
+- medium: rsctest: Add basic support for systemd services
+- medium: ui_maintenance: Combine action and actionssh into a single command
+- low: rsctest: Better error message for unsupported action
+- low: cibconfig: Improve wording of commit prompt
+- high: cibconfig: Delay reinitialization after commit
+- doc: Add website template for the nongnu page
+- medium: main: Disable interspersed args
+- low: cibconfig: Fix vim modeline
+- high: report: Find nodes for any log type (boo#900654)
+- high: hb_report: Collect logs from journald (boo#900654)
+- doc: Clarified note for default-timeouts
+- doc: Remove reference to crmsh documentation at clusterlabs.org
+- doc: start-guide: Fix version check
+- medium: xmlutil: Use idmgmt when creating new elements (bnc#901543)
+- doc: cibconfig: Add note on inner ids after rename
+- high: cibconfig: Don't crash if given an invalid pattern (bnc#901714)
+- high: xmlutil: Filter list of referenced resources (bnc#901714)
+- medium: ui_resource: Only act on resources (#64)
+- medium: ui_resource: Flatten, then filter (#64)
+- high: ui_resource: Use correct name for error function (bnc#901453)
+- high: ui_resource: resource trace failed if operation existed (bnc#901453)
+
 * Mon Jun 30 2014 Kristoffer Grönlund kgronl...@suse.com and many others
 - Release 2.1
 - Add atom feed to development page
diff -urN '--exclude=CVS' '--exclude=.cvsignore' 

commit crmsh for openSUSE:Factory

2014-10-11 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-10-11 19:26:41

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  2014-09-28 
19:54:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-10-11 
19:28:33.0 +0200
@@ -1,0 +2,19 @@
+Fri Oct 10 17:30:14 UTC 2014 - kgronl...@suse.com
+
+- high: report: Find nodes for any log type (boo#900654)
+- high: hb_report: Collect logs from journald (boo#900654)
+- upstream cs: 2.1.0-98-g2405e74
+
+---
+Fri Oct 10 08:50:08 UTC 2014 - kgronl...@suse.com
+
+- high: ui_maintenance: Add maintenance sublevel (bnc#899234)
+- medium: rsctest: Add basic support for systemd services
+- medium: ui_maintenance: Combine action and actionssh into a single command
+- low: rsctest: Better error message for unsupported action
+- low: cibconfig: Improve wording of commit prompt
+- high: cibconfig: Delay reinitialization after commit (bnc#900271)
+- medium: main: Disable interspersed args
+- upstream cs: 2.1.0-95-g744ad66
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.5NmvSC/_old  2014-10-11 19:28:34.0 +0200
+++ /var/tmp/diff_new_pack.5NmvSC/_new  2014-10-11 19:28:34.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git82
+Version:2.1+git98
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.adoc new/crmsh/doc/crm.8.adoc
--- old/crmsh/doc/crm.8.adoc2014-09-26 12:07:07.0 +0200
+++ new/crmsh/doc/crm.8.adoc2014-10-10 19:26:22.0 +0200
@@ -3808,6 +3808,76 @@
 weak-bond resource-1 resource-2
 
 
+[[cmdhelp_maintenance,Maintenance mode commands]]
+=== `maintenance` - Maintenance mode commands
+
+Maintenance mode commands are commands that manipulate resources
+directly without going through the cluster infrastructure. Therefore,
+it is essential to ensure that the cluster does not attempt to monitor
+or manipulate the resources while these commands are being executed.
+
+To ensure this, these commands require that maintenance mode is set
+either for the particular resource, or for the whole cluster.
+
+[[cmdhelp_maintenance_on,Enable maintenance mode]]
+ `on`
+
+Enables maintenances mode, either for the whole cluster
+or for the given resource.
+
+Usage:
+...
+on
+on rsc
+...
+Example:
+...
+on rsc1
+...
+
+[[cmdhelp_maintenance_off,Disable maintenance mode]]
+ `off`
+
+Disables maintenances mode, either for the whole cluster
+or for the given resource.
+
+Usage:
+...
+off
+off rsc
+...
+Example:
+...
+off rsc1
+...
+
+[[cmdhelp_maintenance_action,Invoke a resource action]]
+ `action`
+
+Invokes the given action for the resource. This is
+done directly via the resource agent, so the command must
+be issued while the cluster or the resource is in 
+maintenance mode.
+
+Unless the action is `start` or `monitor`, the action must be invoked
+on the same node as where the resource is running. If the resource is
+running on multiple nodes, the command will fail.
+
+To use pssh for executing resource actions on multiple nodes, append
+`ssh` after the action name. This requires SSH access to be configured
+between the nodes and the pssh package to be installed.
+
+Usage:
+...
+action rsc action
+action rsc action ssh
+...
+Example:
+...
+action webserver reload
+action webserver monitor ssh
+...
+
 [[cmdhelp_history,Cluster history]]
 === `history` - Cluster history
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/website-v1/Makefile 
new/crmsh/doc/website-v1/Makefile
--- old/crmsh/doc/website-v1/Makefile   2014-09-26 12:07:07.0 +0200
+++ new/crmsh/doc/website-v1/Makefile   2014-10-10 19:26:22.0 +0200
@@ -1,4 +1,5 @@
 ASCIIDOC := asciidoc
+CRMCONF := crm.conf
 SRC := faq.adoc documentation.adoc development.adoc installation.adoc \
configuration.adoc about.adoc rsctest-guide.adoc \
history-guide.adoc start-guide.adoc man-1.2.adoc scripts.adoc 
man-2.0.adoc
@@ -20,33 

commit crmsh for openSUSE:Factory

2014-09-28 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-09-28 19:53:56

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  2014-09-19 
22:27:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-09-28 
19:54:13.0 +0200
@@ -1,0 +2,9 @@
+Fri Sep 26 10:18:39 UTC 2014 - kgronl...@suse.com
+
+- low: report: Sort list of nodes
+- low: ui_cluster: More informative error message
+- low: main: Replace getopt with optparse
+- high: parse: Allow empty attribute values in nvpairs (bnc#898625)
+- upstream cs: 2.1.0-82-ge8abd85 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.npnU5D/_old  2014-09-28 19:54:15.0 +0200
+++ /var/tmp/diff_new_pack.npnU5D/_new  2014-09-28 19:54:15.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git71
+Version:2.1+git82
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-09-19 12:38:36.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-09-26 12:07:07.0 +0200
@@ -499,7 +499,7 @@
 Test objects for sanity. This is about semantics.
 '''
 rc = self.__check_unique_clash(set_obj_all)
-for obj in self.obj_set:
+for obj in sorted(self.obj_set, key=lambda x: x.obj_id):
 rc |= obj.check_sanity()
 return rc
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibverify.py 
new/crmsh/modules/cibverify.py
--- old/crmsh/modules/cibverify.py  2014-09-19 12:38:36.0 +0200
+++ new/crmsh/modules/cibverify.py  2014-09-26 12:07:07.0 +0200
@@ -35,9 +35,8 @@
 def verify(cib):
 rc, _, stderr = utils.get_stdout_stderr(cib_verify, cib)
 for i, line in enumerate(line for line in stderr.split('\n') if line):
-line = _prettify(line, 0 if i == 0 else 7)
 if i == 0:
-err_buf.error(line)
+err_buf.error(_prettify(line, 0))
 else:
-err_buf.writemsg(line)
+err_buf.writemsg(_prettify(line, 7))
 return rc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/constants.py 
new/crmsh/modules/constants.py
--- old/crmsh/modules/constants.py  2014-09-19 12:38:36.0 +0200
+++ new/crmsh/modules/constants.py  2014-09-26 12:07:07.0 +0200
@@ -254,12 +254,6 @@
 simulate: crm_simulate,
 }
 
-ra_if = None  # class interface to RA
-stonithd_metadata = None  # stonithd meta data
-pe_metadata = None  # PE meta data
-crmd_metadata = None  # crmd meta data
-cib_metadata = None  # cib meta data
-crm_properties_metadata = None  # PE + crmd + cib meta data
 meta_progs = (crmd, pengine, stonithd, cib)
 # elide these properties from tab completion
 crmd_metadata_do_not_complete = (dc-version,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/main.py new/crmsh/modules/main.py
--- old/crmsh/modules/main.py   2014-09-19 12:38:36.0 +0200
+++ new/crmsh/modules/main.py   2014-09-26 12:07:07.0 +0200
@@ -17,7 +17,6 @@
 
 import sys
 import os
-import getopt
 import atexit
 import random
 
@@ -92,76 +91,62 @@
 return shadow
 
 
-def usage(rc):
-f = sys.stderr
-if rc == 0:
-f = sys.stdout
-print  f, Usage: crm [OPTIONS] [SUBCOMMAND ARGS...]
-
--f, --file='FILE'::
-Load commands from the given file. If a dash `-` is used in place
-of a file name, `crm` will read commands from the shell standard
-input (`stdin`).
-
--c, --cib='CIB'::
-Start the session using the given shadow CIB file.
-Equivalent to `cib use CIB`.
-
--D, --display='OUTPUT_TYPE'::
-Choose one of the output options: plain, color, or
-uppercase. The default is color if the terminal emulation
-supports colors. Otherwise, plain is used.
-
--F, --force::
-Make `crm` proceed with applying changes where it would normally
-ask the user to confirm before proceeding. This option is mainly
-useful in scripts, and 

commit crmsh for openSUSE:Factory

2014-09-19 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-09-19 22:27:39

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  2014-09-12 
17:03:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-09-19 
22:27:44.0 +0200
@@ -1,0 +2,17 @@
+Fri Sep 19 10:59:33 UTC 2014 - kgronl...@suse.com
+
+- high: cibconfig: Add tag:tag to get all resources in tag
+- high: cibconfig: Generate valid CLI syntax for attribute lists (bnc#897462)
+- doc: Sort command list in documentation alphabetically
+- doc: Handle command names with underscore
+- low: ra: Add systemd-support to RaOS
+- low: ui_ra: Don't crash when no OCF agents installed
+- low: corosync: Check tools before use
+- low: main: Catch any ValueErrors that may leak through
+- medium: config: Assign default path in all cases
+- low: ui_template: List both templates and configs by default
+- low: ui_configure: add rm as alias for delete
+- low: template: Add 'new template' shortcut
+- upstream cs: 2.1.0-71-g0d58e2e
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.n9D1UD/_old  2014-09-19 22:27:45.0 +0200
+++ /var/tmp/diff_new_pack.n9D1UD/_new  2014-09-19 22:27:45.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git48
+Version:2.1+git71
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
 5603 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-09-12 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-09-12 15:25:24

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  2014-09-04 
07:56:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-09-12 
17:03:02.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 11 08:27:16 UTC 2014 - kgronl...@suse.com
+
+- Drop patch since pacemaker now has correct version
+  - Removed patch: crmsh-cibadmin_can_patch.patch
+
+---

Old:

  crmsh-cibadmin_can_patch.patch



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.tsUYt4/_old  2014-09-12 17:03:04.0 +0200
+++ /var/tmp/diff_new_pack.tsUYt4/_new  2014-09-12 17:03:04.0 +0200
@@ -45,10 +45,6 @@
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2
-# PATCH-FEATURE-OPENSUSE crmsh-cibadmin_can_patch.patch
-# de...@suse.de -- enable atomic CIB updates here, because our
-# pacemaker version has been fixed in the meantime
-Patch11:crmsh-cibadmin_can_patch.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  pacemaker
 Requires:   pssh
@@ -122,7 +118,6 @@
 
 %prep
 %setup -q -n %{upstream_prefix}
-%patch11 -p1
 
 # Force the local time
 #

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-09-03 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-09-04 07:56:07

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  2014-08-28 
21:05:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-09-04 
07:56:26.0 +0200
@@ -1,0 +2,9 @@
+Wed Sep  3 17:27:45 UTC 2014 - kgronl...@suse.com
+
+- high: scripts: Handle corosync.conf without nodelist in add-node (bnc#862577)
+- medium: cibconfig: Add set command
+- doc: Rename asciidoc files to .adoc
+- high: parse: split shortcuts into valid rules
+- upstream: 2.1.0-48-gc9e9d74
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.e4rfiP/_old  2014-09-04 07:56:27.0 +0200
+++ /var/tmp/diff_new_pack.e4rfiP/_new  2014-09-04 07:56:27.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git38
+Version:2.1+git48
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
 29046 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-08-28 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-08-28 21:05:34

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  2014-08-25 
11:05:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-08-28 
21:05:54.0 +0200
@@ -1,0 +2,7 @@
+Thu Aug 28 13:19:09 UTC 2014 - kgronl...@suse.com
+
+- high: constants: Add acl_target and acl_group to cib_cli_map (bnc#894041)
+- cibconfig: Clean up output from crm_verify (bnc#893138)
+- upstream: 2.1.0-38-g7d05ad6
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.uCJeZU/_old  2014-08-28 21:05:55.0 +0200
+++ /var/tmp/diff_new_pack.uCJeZU/_new  2014-08-28 21:05:55.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git33
+Version:2.1+git38
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/Makefile.am 
new/crmsh/modules/Makefile.am
--- old/crmsh/modules/Makefile.am   2014-08-22 13:11:04.0 +0200
+++ new/crmsh/modules/Makefile.am   2014-08-28 15:12:04.0 +0200
@@ -23,6 +23,7 @@
cache.py \
cibconfig.py \
cibstatus.py \
+   cibverify.py \
clidisplay.py \
cliformat.py \
cmd_status.py \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-08-22 13:11:04.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-08-28 15:12:04.0 +0200
@@ -59,6 +59,7 @@
 from cliformat import cli_nvpair, cli_acl_rule, rsc_set_constraint, get_kind, 
head_id_format
 from cliformat import cli_operations, simple_rsc_constraint, cli_rule, 
cli_format
 from cliformat import cli_acl_role, cli_acl_permission
+import cibverify
 
 
 def show_unrecognized_elems(cib_elem):
@@ -640,9 +641,6 @@
 return rc
 
 
-cib_verify = crm_verify -V -p
-
-
 class CibObjectSetRaw(CibObjectSet):
 '''
 Edit or display one or more CIB objects (XML).
@@ -702,10 +700,12 @@
 if not self.obj_set:
 return True
 clidisplay.disable_pretty()
-rc = pipe_string(cib_verify, self.repr(format=-1))
+cib = self.repr(format=-1)
 clidisplay.enable_pretty()
+rc = cibverify.verify(cib)
+
 if rc not in (0, 1):
-common_debug(verify (rc=%s): %s % (rc, self.repr()))
+common_debug(verify (rc=%s): %s % (rc, cib))
 return rc in (0, 1)
 
 def ptest(self, nograph, scores, utilization, actions, verbosity):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibverify.py 
new/crmsh/modules/cibverify.py
--- old/crmsh/modules/cibverify.py  1970-01-01 01:00:00.0 +0100
+++ new/crmsh/modules/cibverify.py  2014-08-28 15:12:04.0 +0200
@@ -0,0 +1,43 @@
+# Copyright (C) 2014 Kristoffer Gronlund kgronl...@suse.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+import re
+import utils
+from msg import err_buf
+
+
+cib_verify = crm_verify --verbose -p
+VALIDATE_RE = re.compile(r^Entity: line (\d)+: element (\w+):  +
+ rRelax-NG validity error : (.+)$)
+
+
+def _prettify(line, indent=0):
+m = VALIDATE_RE.match(line)
+if m:
+return %s%s (%s): %s % (indent*' ', m.group(2), m.group(1), 
m.group(3))
+return line
+
+
+def verify(cib):
+rc, _, 

commit crmsh for openSUSE:Factory

2014-08-25 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-08-25 11:04:08

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  2014-08-16 
15:38:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-08-25 
11:05:23.0 +0200
@@ -1,0 +2,6 @@
+Fri Aug 22 14:11:47 UTC 2014 - kgronl...@suse.com
+
+- medium: term: Handle $ in input when rendering (bnc#893011)
+- upstream: 2.1.0-33-g8cb6b59 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.lTZIGp/_old  2014-08-25 11:05:24.0 +0200
+++ /var/tmp/diff_new_pack.lTZIGp/_new  2014-08-25 11:05:24.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git30
+Version:2.1+git33
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/term.py new/crmsh/modules/term.py
--- old/crmsh/modules/term.py   2014-08-15 11:33:43.0 +0200
+++ new/crmsh/modules/term.py   2014-08-22 13:11:04.0 +0200
@@ -157,8 +157,8 @@
 
 def render_sub(match):
 s = match.group()
-return getattr(colors, s[2:-1].upper(), s)
-return re.sub(r'\$\$|\${\w+}', render_sub, template)
+return getattr(colors, s[2:-1].upper(), '')
+return re.sub(r'\${\w+}', render_sub, template)
 
 
 def is_color(s):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/test/testcases/commit.exp 
new/crmsh/test/testcases/commit.exp
--- old/crmsh/test/testcases/commit.exp 2014-08-15 11:33:43.0 +0200
+++ new/crmsh/test/testcases/commit.exp 2014-08-22 13:11:04.0 +0200
@@ -65,7 +65,7 @@
meta yoyo-meta=yoyo 2 \
op start requires=nothing interval=0 \
op monitor interval=60m
-group g1 p2 d1
+group g1 d1 p2
 group g2 d3
 location l1 p3 100: node1
 colocation cl1 inf: g1 p3

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-08-16 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-08-16 15:37:53

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  2014-08-05 
21:11:32.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-08-16 
15:38:05.0 +0200
@@ -1,0 +2,7 @@
+Fri Aug 15 11:00:13 UTC 2014 - kgronl...@suse.com
+
+- medium: cibconfig: Support crm_diff --no-version (bnc#888726)
+- low: constants: Add requires to list of meta attributes
+- 2.1.0-30-g7a4a34d
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.C6dYcZ/_old  2014-08-16 15:38:06.0 +0200
+++ /var/tmp/diff_new_pack.C6dYcZ/_new  2014-08-16 15:38:06.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git26
+Version:2.1+git30
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-08-05 15:42:44.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-08-15 11:33:43.0 +0200
@@ -2124,6 +2124,7 @@
 self._no_constraint_rm_msg = False
 # FIXME
 self.supported_cib_re = ^pacemaker-[12][.][0123]$
+self._crm_diff_cmd = None
 
 def is_cib_sane(self):
 # try to initialize
@@ -2393,10 +2394,20 @@
 return False
 tmpfiles.add(tmpf)
 cibadmin_opts = force and -P --force or -P
+
+# check if crm_diff supports --no-version
+if self._crm_diff_cmd is None:
+rc, out = utils.get_stdout(crm_diff --help)
+if --no-version in out:
+self._crm_diff_cmd = 'crm_diff --no-version'
+else:
+self._crm_diff_cmd = 'crm_diff'
+
 # produce a diff:
 # dump_new_conf | crm_diff -o self.cib_orig -n -
 common_debug(Input: %s % (etree.tostring(self.cib_elem)))
-rc, cib_diff = filter_string(crm_diff -o %s -n - % tmpf,
+rc, cib_diff = filter_string(%s -o %s -n - %
+ (self._crm_diff_cmd, tmpf),
  etree.tostring(self.cib_elem))
 if not cib_diff:
 common_err(crm_diff apparently failed to produce the diff 
(rc=%d) % rc)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/constants.py 
new/crmsh/modules/constants.py
--- old/crmsh/modules/constants.py  2014-08-05 15:42:44.0 +0200
+++ new/crmsh/modules/constants.py  2014-08-15 11:33:43.0 +0200
@@ -145,7 +145,7 @@
 allow-migrate, is-managed, interval-origin,
 migration-threshold, priority, multiple-active,
 failure-timeout, resource-stickiness, target-role,
-restart-type, description, remote-node,
+restart-type, description, remote-node, requires,
 )
 group_meta_attributes = (container, )
 clone_meta_attributes = (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/test/testcases/common.excl 
new/crmsh/test/testcases/common.excl
--- old/crmsh/test/testcases/common.excl2014-08-05 15:42:44.0 
+0200
+++ new/crmsh/test/testcases/common.excl2014-08-15 11:33:43.0 
+0200
@@ -13,6 +13,8 @@
 ^\.EXT cibadmin \-Ql
 ^\.EXT crm_verify \-V \-p
 ^\.EXT cibadmin \-p \-P
+^\.EXT crm_diff \-\-help
 ^\.EXT crm_diff \-o [^ ]+ \-n \-
+^\.EXT crm_diff \-\-no\-version \-o [^ ]+ \-n \-
 ^\.EXT sed ['][^']+
 ^\.EXT sed [][^]+

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-08-05 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-08-05 21:11:22

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  2014-07-29 
16:49:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-08-05 
21:11:32.0 +0200
@@ -1,0 +2,7 @@
+Tue Aug  5 13:47:56 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_node: Fix handling of default arguments (bnc#889673)
+- medium: crm_pssh: Degrade functionality if pssh is unpatched
+- upstream: 2.1.0-26-g29f1259
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.2JBryH/_old  2014-08-05 21:11:33.0 +0200
+++ /var/tmp/diff_new_pack.2JBryH/_new  2014-08-05 21:11:33.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git20
+Version:2.1+git26
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
 1723 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-07-29 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-07-29 16:48:42

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  2014-07-11 
20:06:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-07-29 
16:49:14.0 +0200
@@ -1,0 +2,16 @@
+Tue Jul 29 09:51:32 UTC 2014 - kgronl...@suse.com
+
+- high: report: Preserve path when checking timestamp of tarball (bnc#889328)
+- upstream: 2.1.0-20-g9de903ff5cd8 
+
+---
+Tue Jul 22 07:42:50 UTC 2014 - kgronl...@suse.com
+
+- medium: config: Respect EDITOR and PAGER environment variables
+- medium: parse: pacemaker allows order without score or kind
+- medium: hb_report: add -Q option for quick runs
+- low: history: use -Q with hb_report to reduce waiting time
+- low: hb_report: add timestamp when debugging
+- upstream: 2.1.0-18-gb5962a2bb1d9 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.K65hMZ/_old  2014-07-29 16:49:15.0 +0200
+++ /var/tmp/diff_new_pack.K65hMZ/_new  2014-07-29 16:49:15.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git6
+Version:2.1+git20
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-07-02 12:51:37.0 +0200
+++ new/crmsh/doc/crm.8.txt 2014-07-29 11:38:00.0 +0200
@@ -728,7 +728,7 @@
 
 
 primitive dummy-1 params $dummy-state-on:state=1
-primitive dummy-2 params @state
+primitive dummy-2 params @dummy-state-on
 
 
 There is also the possibility that two resources both use the same
@@ -2682,9 +2682,9 @@
 
 Usage:
 ...
-order id {kind|score}: first then [symmetrical=bool]
+order id [{kind|score}:] first then [symmetrical=bool]
 
-order id {kind|score}: resource_sets [symmetrical=bool]
+order id [{kind|score}:] resource_sets [symmetrical=bool]
 
 kind :: Mandatory | Optional | Serialize
 
@@ -2702,9 +2702,10 @@
 ...
 Example:
 ...
-order c_apache_1 Mandatory: apache:start ip_1
-order o1 Serialize: A ( B C )
-order order_2 Mandatory: [ A B ] C
+order o-1 Mandatory: apache:start ip_1
+order o-2 Serialize: A ( B C )
+order o-3 inf: [ A B ] C
+order o-4 first-resource then-resource
 ...
 
 [[cmdhelp_configure_rsc_ticket,resources ticket dependency]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crmsh_hb_report.8.txt 
new/crmsh/doc/crmsh_hb_report.8.txt
--- old/crmsh/doc/crmsh_hb_report.8.txt 2014-07-02 12:51:37.0 +0200
+++ new/crmsh/doc/crmsh_hb_report.8.txt 2014-07-29 11:38:00.0 +0200
@@ -13,7 +13,8 @@
 SYNOPSIS
 
 *crm report* -f {time|cts:testnum} [-t time] [-u user] [-l file]
-   [-n nodes] [-E files] [-p patt] [-L patt] [-e prog] [-MSDCZAVsvhd] 
[dest]
+   [-n nodes] [-E files] [-p patt] [-L patt] [-e prog]
+  [-MSDCZAQVsvhd] [dest]
 
 
 DESCRIPTION
@@ -74,6 +75,14 @@
Additional patterns to match parameter name which contain
sensitive information. This option is additive (default: passw.*).
 
+*-Q*::
+   Quick run. Gathering some system information can be expensive.
+   With this option, such operations are skipped and thus
+   information collecting sped up. The operations considered
+   I/O or CPU intensive: verifying installed packages content,
+   sanitizing files for sensitive information, and producing dot
+   files from PE inputs.
+
 *-A*::
This is an OpenAIS cluster. `crm report` has some heuristics to
find the cluster stack, but that is not always reliable.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/website-v1/start-guide.txt 
new/crmsh/doc/website-v1/start-guide.txt
--- old/crmsh/doc/website-v1/start-guide.txt2014-07-02 12:51:37.0 
+0200
+++ new/crmsh/doc/website-v1/start-guide.txt2014-07-29 11:38:00.0 
+0200
@@ -94,25 +94,110 @@
 other nodes map to the IP addresses of those nodes. For example in a
 cluster consisting of `alice` and `bob`, executing `ping bob` when
 logged in as root on 

commit crmsh for openSUSE:Factory

2014-07-11 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-07-11 20:06:07

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  2014-07-02 
15:05:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-07-11 
20:06:08.0 +0200
@@ -1,0 +2,6 @@
+Wed Jul  2 12:42:22 UTC 2014 - kgronl...@suse.com
+
+- Low: hb_report: combine-logs.pl is obsolete
+- upstream: 2.1.0-6-g52f6af222dcb 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.zigjEq/_old  2014-07-11 20:06:09.0 +0200
+++ /var/tmp/diff_new_pack.zigjEq/_new  2014-07-11 20:06:09.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.1+git4
+Version:2.1+git6
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/hb_report/Makefile.am 
new/crmsh/hb_report/Makefile.am
--- old/crmsh/hb_report/Makefile.am 2014-06-30 12:58:11.0 +0200
+++ new/crmsh/hb_report/Makefile.am 2014-07-02 12:51:37.0 +0200
@@ -20,6 +20,6 @@
 MAINTAINERCLEANFILES  = Makefile.in
 hanoarchdir   = $(datadir)/@PACKAGE@
 hanoarch_DATA = utillib.sh ha_cf_support.sh openais_conf_support.sh
-hanoarch_SCRIPTS  = combine-logs.pl hb_report
+hanoarch_SCRIPTS  = hb_report
 
 EXTRA_DIST= $(hanoarch_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/hb_report/combine-logs.pl 
new/crmsh/hb_report/combine-logs.pl
--- old/crmsh/hb_report/combine-logs.pl 2014-06-30 12:58:11.0 +0200
+++ new/crmsh/hb_report/combine-logs.pl 1970-01-01 01:00:00.0 +0100
@@ -1,136 +0,0 @@
-#!/usr/bin/perl
-#
-# combine-logs v1.0
-#
-# Copyright (c) 1999 Steven J. Madsen.  All rights reserved.
-#
-# Combines multiple syslog-format logs into a single chronological log.  Very
-# handy for syslog report generators such as cksyslog.
-#
-# usage: combine-logs log file [...]
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
USA.
-#
-# Note by Dejan Muhamedagic de...@suse.de
-#
-# This program was downloaded from
-# http://www.moonglade.com/syslog/combine-logs-1.0.tar.gz
-#
-
-$debugging = 0;
-
-# Open all of the logs.
-$handle = fh00;
-foreach $file (@ARGV)
-{
-$handle++;
-open $handle, $file || die Could not open $file: $!\n;
-push @fh, $handle;
-}
-
-# Get the first line from each of the files.
-$i = 0;
-foreach $handle (@fh)
-{
-$current_line[$i++] = get_next_line($handle);
-}
-
-# Process the logs.
-while (1)
-{
-$first = 0;
-for ($i = 1; $i  @fh; $i++)
-{
-   if (first_entry($current_line[$first], $current_line[$i]))
-   {
-   $first = $i;
-   }
-}
-# Fall out if the entry isn't defined (no more entries to print).
-last if !defined($current_line[$first]);
-
-# Print the entry and get the next line from that log.
-print $current_line[$first];
-$current_line[$first] = get_next_line($fh[$first]);
-}
-
-# Gets the next line from the provided file handle.
-sub get_next_line()
-{
-my($handle) = @_;
-my($line);
-while ($line = $handle)
-{
-   print  read $line if $debugging;
-
-   # Weed out useless last message repeated messages.
-   next if $line =~ m/last message repeated \d+ times$/;
-   
-   # Fall out if the line passes the above tests.
-   last;
-}
-return $line;
-}
-
-# Determines which syslog-style log entry comes first.  If $a comes first,
-# the function returns 0.  If $b comes first, the function returns 1.
-sub first_entry()
-{
-my($a, $b) = @_;
-print  

commit crmsh for openSUSE:Factory

2014-07-02 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-07-02 15:05:02

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  2014-06-25 
15:24:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-07-02 
15:05:16.0 +0200
@@ -1,0 +2,19 @@
+Tue Jul  1 08:54:43 UTC 2014 - kgronl...@suse.com
+
+- Doc: Fix incorrect title for script section
+- Low: help: Handle topics with subtopics correctly
+- upstream: 2.1.0-4-g7993c9d0f0c8 
+
+---
+Tue Jul  1 08:44:34 UTC 2014 - kgronl...@suse.com
+
+- Doc: Update ChangeLog for release 2.1
+- upstream: 2.1.0
+
+---
+Wed Jun 25 14:32:35 UTC 2014 - kgronl...@suse.com
+
+- Medium: hb_report: dot is not illegal in file names (bnc#884079, 
debian#715391)
+- upstream: 2.0.0-151-g74bdd9a1a02a 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Px2P9c/_old  2014-07-02 15:05:17.0 +0200
+++ /var/tmp/diff_new_pack.Px2P9c/_new  2014-07-02 15:05:17.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git149
+Version:2.1+git4
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
 24321 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-06-25 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-06-25 15:24:25

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  2014-06-23 
09:24:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-06-25 
15:24:41.0 +0200
@@ -1,0 +2,6 @@
+Wed Jun 25 08:40:22 UTC 2014 - kgronl...@suse.com
+
+- low: history: remove existing report directory on refresh
+- upstream: 2.0.0-149-gfb2c8c0591cb 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.IAcipZ/_old  2014-06-25 15:24:42.0 +0200
+++ /var/tmp/diff_new_pack.IAcipZ/_new  2014-06-25 15:24:42.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git147
+Version:2.0+git149
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/report.py new/crmsh/modules/report.py
--- old/crmsh/modules/report.py 2014-06-19 19:55:09.0 +0200
+++ new/crmsh/modules/report.py 2014-06-24 23:58:40.0 +0200
@@ -689,6 +689,7 @@
 if os.path.isdir(loc):
 if (os.stat(bfname).st_mtime - os.stat(loc).st_mtime)  60:
 return loc
+rmdir_r(loc)
 cwd = os.getcwd()
 if parentdir:
 try:

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-06-23 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-06-23 09:23:55

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  2014-06-16 
21:25:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-06-23 
09:24:01.0 +0200
@@ -1,0 +2,13 @@
+Thu Jun 19 16:39:16 UTC 2014 - kgronl...@suse.com
+
+- Medium: hb_report: update interface to zypper (bnc#883186)
+- Medium: hb_report: support logs with varied timestamps (bnc#883186)
+- Low: hb_report: getstampproc is global (bnc#883186)
+- Low: hb_report: gdb debug symbols output change (bnc#883186)
+- Low: hb_report: don't restrict debuginfo to cluster stack binaries (zypper) 
(bnc#883186)
+- high: ui_history: Lazily fetch report data on command (bnc#882959)
+- medium: report: Make setting report period more robust (bnc#882959)
+- medium: ui_history: Print source if given no argument (bnc#883437)
+- upstream: 2.0.0-147-g9ea5208a0054 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.AzkmN3/_old  2014-06-23 09:24:02.0 +0200
+++ /var/tmp/diff_new_pack.AzkmN3/_new  2014-06-23 09:24:02.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git133
+Version:2.0+git147
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.conf new/crmsh/doc/crm.conf
--- old/crmsh/doc/crm.conf  2014-06-13 16:26:53.0 +0200
+++ new/crmsh/doc/crm.conf  2014-06-19 19:55:09.0 +0200
@@ -45,7 +45,7 @@
 /div
 /div
 
-a href=https://github.com/crmsh/crmsh;img style=position: absolute; top: 
0; right: 0; border: 0; 
src=https://camo.githubusercontent.com/a6677b08c955af8400f44c6298f40e7d19cc5b2d/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67;
 alt=Fork me on GitHub 
data-canonical-src=https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png;/a
+a href=https://github.com/crmsh/crmsh;img style=position: absolute; top: 
0; right: 0; border: 0; 
src=https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f373630302e706e67;
 alt=Fork me on GitHub 
data-canonical-src=https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png;/a
 
 /body
 /html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/hb_report/hb_report.in 
new/crmsh/hb_report/hb_report.in
--- old/crmsh/hb_report/hb_report.in2014-06-13 16:26:53.0 +0200
+++ new/crmsh/hb_report/hb_report.in2014-06-19 19:55:09.0 +0200
@@ -1056,7 +1056,7 @@
 }
 # get the right part of the log
 getlog() {
-   local getstampproc cnt
+   local cnt
local outf
outf=$WORKDIR/$HALOG_F
 
@@ -1106,7 +1106,7 @@
 # get all other info (config, stats, etc)
 #
 collect_info() {
-   local getstampproc l
+   local l
sys_info  $WORKDIR/$SYSINFO_F 21 
sys_stats  $WORKDIR/$SYSSTATS_F 21 
getconfig $WORKDIR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/hb_report/utillib.sh 
new/crmsh/hb_report/utillib.sh
--- old/crmsh/hb_report/utillib.sh  2014-06-13 16:26:53.0 +0200
+++ new/crmsh/hb_report/utillib.sh  2014-06-19 19:55:09.0 +0200
@@ -175,10 +175,21 @@
 getstamp_rfc5424() {
awk '{print $1}'
 }
+get_ts() {
+   local l=$1 ts
+   ts=$(str2time `echo $l | $getstampproc`)
+   if [ -z $ts ]; then
+   local fmt
+   for fmt in rfc5424 syslog legacy; do
+   [ getstamp_$fmt = $getstampproc ]  continue
+   ts=$(str2time `echo $l | getstamp_$fmt`)
+   [ -n $ts ]  break
+   done
+   fi
+   echo $ts
+}
 linetime() {
-   local l
-   l=`tail -n +$2 $1 | head -1 | $getstampproc`
-   str2time $l
+   get_ts `tail -n +$2 $1 | head -1`
 }
 find_getstampproc() {
local t l func trycnt
@@ -210,7 +221,7 @@
 find_first_ts() {
local l ts
while read l; do
-   ts=$(str2time `echo $l | 

commit crmsh for openSUSE:Factory

2014-06-16 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-06-16 21:25:45

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  2014-06-06 
14:36:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-06-16 
21:25:47.0 +0200
@@ -1,0 +2,40 @@
+Fri Jun 13 14:32:19 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_resource: Remove empty attrlists when overriding children 
(bnc#882655)
+- high: cibconfig: Retain empty attribute sets (bnc#882655)
+- low: report: unpack tarball if it's newer than the existing directory
+- low: report: get node list based on collected logs, not from cib
+- low: report: test for ha-log.txt instead of cib.txt when listing nodes
+- low: report: don't warn on extra nodes in the report
+- upstream: 2.0.0-133-g934052881c13 
+
+---
+Thu Jun 12 15:26:09 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_configure: Nicer error when pacemaker is not running (bnc#882475)
+- medium: scripts: configure SSH in cluster init (bnc#882476)
+- medium: ui_assist: add template command (bnc#882477)
+- upstream: 2.0.0-125-g758b534296ff
+
+---
+Thu Jun 12 04:30:22 UTC 2014 - kgronl...@suse.com
+
+- medium: cliformat: Fix CLI formatting for rules and id-refs
+- upstream: 2.0.0-121-g2bf7a531e5ac 
+
+---
+Wed Jun 11 09:07:54 UTC 2014 - kgronl...@suse.com
+
+- doc: Improved documentation for constraints (bnc#873781)
+- doc: Document interval suffixes (bnc#873677)
+- upstream: 2.0.0-119-gb2f081b32b1a 
+
+---
+Tue Jun 10 09:01:33 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_node: Fix display of node attributes (bnc#881979)
+- medium: parse: Allow remote as node type
+- low: cliformat: Don't show extraneous id for acl rules
+- upstream: 2.0.0-115-gf5dfb15e7f43
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.neoXUX/_old  2014-06-16 21:25:48.0 +0200
+++ /var/tmp/diff_new_pack.neoXUX/_new  2014-06-16 21:25:48.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git111
+Version:2.0+git133
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
 2729 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-06-06 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-06-06 14:36:30

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  2014-06-05 
10:50:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-06-06 
14:36:43.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun  5 09:28:05 UTC 2014 - kgronl...@suse.com
+
+- high: cibconfig: Fix bug in copy_nvpairs (bnc#881369)
+- upstream: 2.0.0-111-gf36401b 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.126CpM/_old  2014-06-06 14:36:44.0 +0200
+++ /var/tmp/diff_new_pack.126CpM/_new  2014-06-06 14:36:44.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git109
+Version:2.0+git111
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-06-03 22:39:19.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-06-05 11:15:01.0 +0200
@@ -185,6 +185,28 @@
 return fill_nvpairs(name, node, attrs, id_hint)
 
 
+def copy_nvpair(nvpairs, nvp, id_hint=None):
+
+Copies the given nvpair into the given tag containing nvpairs
+
+common_debug(copy_nvpair: %s % (etree.tostring(nvp)))
+if 'value' not in nvp.attrib:
+nvpairs.append(copy.deepcopy(nvp))
+return
+n = nvp.get('name')
+if id_hint is None:
+id_hint = n
+for nvp2 in nvpairs:
+if nvp2.get('name') == n:
+nvp2.set('value', nvp.get('value'))
+break
+else:
+m = copy.deepcopy(nvp)
+nvpairs.append(m)
+if 'id' not in m.attrib:
+m.set('id', idmgmt.new(m, id_hint))
+
+
 def copy_nvpairs(tonode, fromnode):
 
 copy nvpairs from fromnode to tonode.
@@ -197,21 +219,6 @@
 else:
 tonode.append(copy.deepcopy(cnode))
 
-def copy_nvpair(nvp):
-if 'value' not in nvp:
-tonode.append(copy.deepcopy(nvp))
-return
-n = nvp.get('name')
-for nvp2 in tonode:
-if nvp2.get('name') == n:
-nvp2.set('value', nvp.get('value'))
-break
-else:
-m = copy.deepcopy(nvp)
-tonode.append(m)
-if 'id' not in m.attrib:
-m.set('id', idmgmt.new(m, id_hint))
-
 def copy_id(node):
 nid = node.get('id')
 for nvp2 in tonode:
@@ -221,13 +228,13 @@
 else:
 tonode.append(copy.deepcopy(node))
 
-common_debug(copy_nvpairs: %s % (etree.tostring(fromnode)))
+common_debug(copy_nvpairs: %s - %s % (etree.tostring(fromnode), 
etree.tostring(tonode)))
 id_hint = tonode.get('id')
 for c in fromnode:
 if is_comment(c):
 copy_comment(c)
 elif c.tag == nvpair:
-copy_nvpair(c)
+copy_nvpair(tonode, c, id_hint=id_hint)
 elif 'id' in c.attrib:  # ok, it has an id, we can work with this
 copy_id(c)
 else:  # no idea what this is, just copy it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/test/testcases/edit.exp 
new/crmsh/test/testcases/edit.exp
--- old/crmsh/test/testcases/edit.exp   2014-06-03 22:39:19.0 +0200
+++ new/crmsh/test/testcases/edit.exp   2014-06-05 11:15:01.0 +0200
@@ -120,9 +120,6 @@
 .TRY configure filter 'sed s/stonith-enabled=true//'
 .EXT crm_resource --list-standards
 .EXT crm_resource --list-ocf-alternatives Dummy
-.EXT crm_resource --show-metadata ocf:heartbeat:Dummy
-.EXT crm_resource --show-metadata stonith:heartbeat:null
-.EXT stonithd metadata
 .EXT crmd metadata
 .EXT pengine metadata
 .EXT cib metadata
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/test/unittests/test_bugs.py 
new/crmsh/test/unittests/test_bugs.py
--- old/crmsh/test/unittests/test_bugs.py   2014-06-03 22:39:19.0 
+0200
+++ new/crmsh/test/unittests/test_bugs.py   2014-06-05 11:15:01.0 
+0200
@@ -270,3 +270,31 @@
 obj3 = factory.create_object('group', 'g2', 'p1')
 print obj3
 assert obj3 is False
+
+
+def test_copy_nvpairs():
+from cibconfig 

commit crmsh for openSUSE:Factory

2014-06-05 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-06-05 10:50:03

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  2014-06-01 
19:40:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-06-05 
10:50:09.0 +0200
@@ -1,0 +2,17 @@
+Tue Jun  3 21:06:00 UTC 2014 - kgronl...@suse.com
+
+- high: parse: Try to retain ordering if possible (bnc#880371)
+- high: cibconfig: Enable use of v2 patches in Pacemaker (bnc#880371)
+- medium: resource: modify some command wait options (bnc#880982) 
+- upstream: 2.0.0-109-g0b2645b 
+
+---
+Mon Jun  2 17:33:11 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_resource: trace promote/demote for multistate resources
+- medium: parse: Allow empty property sets (bnc#880632)
+- high: parse: support for ACL schema 2.0 (bnc#880371)
+- medium: schema: Fix typo in test_schema()
+- upstream: 2.0.0-101-gbb441f1 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.6ZRKah/_old  2014-06-05 10:50:12.0 +0200
+++ /var/tmp/diff_new_pack.6ZRKah/_new  2014-06-05 10:50:12.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git93
+Version:2.0+git109
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-05-27 20:11:56.0 +0200
+++ new/crmsh/doc/crm.8.txt 2014-06-03 22:39:19.0 +0200
@@ -525,6 +525,15 @@
 [[topics_Security,Access Control Lists (ACL)]]
 == Access Control Lists (ACL)
 
+.Note on ACLs in Pacemaker 1.1.12
+
+The support for ACLs has been revised in Pacemaker version 1.1.12 and
+up. Depending on which version you are using, the information in this
+section may no longer be accurate. Look for the `acl_target` and
+`acl_group` configuration elements for more details on the new
+syntax.
+
+
 By default, the users from the `haclient` group have full access
 to the cluster (or, more precisely, to the CIB). Access control
 lists allow for finer access control to the cluster.
@@ -1510,27 +1519,34 @@
 monitor, note that the number of trace files can grow very
 quickly.
 
+If no operation name is given, crmsh will attempt to trace all
+operations for the RA. This includes any configured operations, start
+and stop as well as promote/demote for multistate resources.
+
 Usage:
 ...
-trace rsc op [interval]
+trace rsc [op [interval] ]
 ...
 Example:
 ...
 trace fs start
+trace webserver
 ...
 
 [[cmdhelp_resource_untrace,stop RA tracing]]
  `untrace`
 
-Stop tracing RA for the given operation.
+Stop tracing RA for the given operation. If no operation name is
+given, crmsh will attempt to stop tracing all operations in resource.
 
 Usage:
 ...
-untrace rsc op [interval]
+untrace rsc [op [interval] ]
 ...
 Example:
 ...
 untrace fs start
+untrace webserver
 ...
 
 [[cmdhelp_resource_scores,Display resource scores]]
@@ -2786,6 +2802,35 @@
 role:read_all
 ...
 
+[[cmdhelp_configure_acl_target,Define target access rights]]
+ `acl_target`
+
+Defines an ACL target.
+
+Usage:
+
+acl_target tid [role ...]
+
+Example:
+
+acl_target joe resource_admin constraint_editor
+
+
+[[cmdhelp_configure_acl_group,Define group access rights]]
+ `acl_group`
+
+Defines an ACL group.
+
+Usage:
+
+acl_group gid [role ...]
+
+Example:
+
+acl_group hacluster operator
+
+
+
 [[cmdhelp_configure_op_defaults,set resource operations defaults]]
  `op_defaults`
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-05-27 20:11:56.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-06-03 22:39:19.0 +0200
@@ -58,6 +58,7 @@
 from cliformat import get_score, nvpairs2list, abs_pos_score, cli_acl_roleref, 
nvpair_format
 from cliformat import 

commit crmsh for openSUSE:Factory

2014-06-01 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-06-01 19:40:19

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  2014-05-23 
07:51:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-06-01 
19:40:23.0 +0200
@@ -1,0 +2,9 @@
+Tue May 27 18:13:25 UTC 2014 - kgronl...@suse.com
+
+- high: cibconfig: adjust attributes when adding operations (bnc#880052)
+- high: parse: Support id-ref in nvpairs (fate#316118)
+- low: ui_configure: Add --force flag to configure delete
+- low: ui_resource: Allow untrace without explicit interval
+- upstream: 2.0.0-93-g29c4073 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.e9PSHG/_old  2014-06-01 19:40:25.0 +0200
+++ /var/tmp/diff_new_pack.e9PSHG/_new  2014-06-01 19:40:25.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git88
+Version:2.0+git93
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-05-22 19:04:46.0 +0200
+++ new/crmsh/doc/crm.8.txt 2014-05-27 20:11:56.0 +0200
@@ -2146,6 +2146,79 @@
 true, explicitly set `sequential` in a parenthesis set:
 `A B ( C D sequential=true )`.
 
+ References in attribute lists
+
+Attribute lists are used to set attributes and parameters for
+resources, constraints and property definitions. For example, to set
+the virtual IP used by an `IPAddr` resource the attribute `ip` can be
+set in an attribute list for that resource.
+
+Attribute lists can have identifiers that name them, and other
+resources can reuse the same attribute list by referring to that name
+using an `$id-ref`. For example, the following statement defines a
+simple dummy resource with an attribute list which sets the parameter
+`state to the value 1 and sets the identifier for the attribute list
+to `on-state`:
+
+..
+primitive dummy-1 Dummy params $id=on-state state=1
+..
+
+To refer to this attribute list from a different resource, refer to
+the `on-state` name using an id-ref:
+
+..
+primitive dummy-2 Dummy params $id-ref=on-state
+..
+
+The resource `dummy-2` will now also have the parameter `state` set to the 
value 1.
+
+= Referencing individual attributes
+
+In some cases, referencing complete attribute lists is too
+coarse-grained, for example if two different parameters with different
+names should have the same value set. Instead of having to copy the
+value in multiple places, it is possible to create references to
+individual attributes in attribute lists.
+
+To name an attribute in order to be able to refer to it later, prefix
+the attribute name with a `$` character (as seen above with the
+special names `$id` and `$id-ref`:
+
+
+primitive dummy-1 Dummy params $state=1
+
+
+The identifier `state` can now be used to refer to this attribute from other
+primitives, using the `@id` syntax:
+
+
+primitive dummy-2 Dummy params @state
+
+
+In some cases, using the attribute name as the identifier doesn't work
+due to name clashes. In this case, the syntax `$id:name=value`
+can be used to give the attribute a different identifier:
+
+
+primitive dummy-1 params $dummy-state-on:state=1
+primitive dummy-2 params @state
+
+
+There is also the possibility that two resources both use the same
+attribute value but with different names. For example, a web server
+may have a parameter `server_ip` for setting the IP address where it
+listens for incoming requests, and a virtual IP resource may have a
+parameter called `ip` which sets the IP address it creates. To
+configure these two resources with an IP without repeating the value,
+the reference can be given a name using the syntax `@id:name`.
+
+Example:
+
+primitive virtual-ip IPaddr2 params $vip:ip=192.168.1.100
+primitive webserver apache params @vip:server_ip
+
+
 [[cmdhelp_configure_node,define a cluster node]]
  `node`
 
@@ -2861,9 +2934,12 @@
 in that container, then the container is deleted as well. Any
 related constraints are removed as well.
 
+If the object is a started 

commit crmsh for openSUSE:Factory

2014-05-22 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-05-23 07:51:34

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  2014-05-17 
21:43:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-05-23 
07:51:35.0 +0200
@@ -1,0 +2,7 @@
+Thu May 22 17:05:53 UTC 2014 - kgronl...@suse.com
+
+- medium: xmlutil: Limit xpath search to children (bnc#879419)
+- medium: ui: Fix argument check in resource commands (gh#crmsh/crmsh#29)
+- upstream: 2.0.0-88-g598dfd4
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.1XvZmQ/_old  2014-05-23 07:51:36.0 +0200
+++ /var/tmp/diff_new_pack.1XvZmQ/_new  2014-05-23 07:51:36.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git85
+Version:2.0+git88
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/ui_node.py new/crmsh/modules/ui_node.py
--- old/crmsh/modules/ui_node.py2014-05-16 13:20:50.0 +0200
+++ new/crmsh/modules/ui_node.py2014-05-22 19:04:46.0 +0200
@@ -168,10 +168,9 @@
 if not argl:
 node = utils.this_node()
 elif len(argl) == 1:
-if xmlutil.is_our_node(args[0]):
-node = args[0]
-else:
-common_err(%s: node name not recognized % args[0])
+node = args[0]
+if not xmlutil.is_our_node(node):
+common_err(%s: node name not recognized % node)
 return False
 else:
 syntax_err(args, context=context.get_command_name())
@@ -289,31 +288,34 @@
 
 @command.wait
 @command.completers(compl.nodes, compl.choice(['set', 'delete', 'show']), 
compl.resources)
-def do_attribute(self, context, *args):
+def do_attribute(self, context, node, cmd, rsc, value=None):
 usage:
 attribute node set rsc value
 attribute node delete rsc
 attribute node show rsc
-return ui_utils.manage_attr(context.get_command_name(), 
self.node_attr, args)
+return ui_utils.manage_attr(context.get_command_name(), self.node_attr,
+node, cmd, rsc, value)
 
 @command.wait
 @command.completers(compl.nodes, compl.choice(['set', 'delete', 'show']), 
compl.resources)
-def do_utilization(self, context, *args):
+def do_utilization(self, context, node, cmd, rsc, value=None):
 usage:
 utilization node set rsc value
 utilization node delete rsc
 utilization node show rsc
-return ui_utils.manage_attr(context.get_command_name(), 
self.node_utilization, args)
+return ui_utils.manage_attr(context.get_command_name(), 
self.node_utilization,
+node, cmd, rsc, value)
 
 @command.wait
 @command.name('status-attr')
 @command.completers(compl.nodes, compl.choice(['set', 'delete', 'show']), 
compl.resources)
-def do_status_attr(self, context, *args):
+def do_status_attr(self, context, node, cmd, rsc, value=None):
 usage:
 status-attr node set rsc value
 status-attr node delete rsc
 status-attr node show rsc
-return ui_utils.manage_attr(context.get_command_name(), 
self.node_status, args)
+return ui_utils.manage_attr(context.get_command_name(), 
self.node_status,
+node, cmd, rsc, value)
 
 
 # vim:ts=4:sw=4:et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/ui_resource.py 
new/crmsh/modules/ui_resource.py
--- old/crmsh/modules/ui_resource.py2014-05-16 13:20:50.0 +0200
+++ new/crmsh/modules/ui_resource.py2014-05-22 19:04:46.0 +0200
@@ -312,28 +312,25 @@
 @command.alias('move')
 @command.skill_level('administrator')
 @command.completers_repeating(compl.resources, compl.nodes,
-  compl.choice(['lifetime', 'force']))
-def do_migrate(self, context, *args):
+  compl.choice(['reboot', 'forever', 'force']))
+def do_migrate(self, context, rsc, *args):
 usage: migrate rsc [node] [lifetime] [force]
-argl 

commit crmsh for openSUSE:Factory

2014-05-17 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-05-17 21:43:24

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  2014-05-15 
19:10:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-05-17 
21:43:25.0 +0200
@@ -1,0 +2,9 @@
+Fri May 16 11:31:42 UTC 2014 - kgronl...@suse.com
+
+- high: xmlutil: Include remote nodes in nodelist (bnc#877962)
+- high: cibconfig: Ban containers stealing children (bnc#878112)
+- high: parse: Allow role in rule-based location constraints (bnc#878128)
+- low: command: Add -h and --help as aliases to help
+- upstream: 2.0.0-85-g5c9da05
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.faZxQZ/_old  2014-05-17 21:43:26.0 +0200
+++ /var/tmp/diff_new_pack.faZxQZ/_new  2014-05-17 21:43:26.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git73
+Version:2.0+git85
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-05-14 16:04:21.0 +0200
+++ new/crmsh/doc/crm.8.txt 2014-05-16 13:20:50.0 +0200
@@ -2406,9 +2406,9 @@
 
 Usage:
 ...
-location id rsc {node_pref|rules}
+location id rsc [role=role] {node_pref|rules}
 
-node_pref :: score: node [role=role]
+node_pref :: score: node
 
 rules ::
   rule [id_spec] [$role=role] score: expression
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-05-14 16:04:21.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-05-16 13:20:50.0 +0200
@@ -1621,16 +1621,16 @@
 s = clidisplay.keyword(self.obj_type)
 id = clidisplay.id(self.obj_id)
 s = %s %s %s % (s, id, rsc)
+
+role = self.node.get(role)
+if role is not None:
+s +=  role=%s % (role)
+
 pref_node = self.node.get(node)
 score = clidisplay.score(get_score(self.node))
 if pref_node is not None:
-ret = %s %s: %s % (s, score, pref_node)
-role = self.node.get(role)
-if role is not None:
-ret +=  role=%s % (role)
-return ret
-else:
-return s
+s = %s %s: %s % (s, score, pref_node)
+return s
 
 def _repr_cli_child(self, c, format):
 if c.tag == rule:
@@ -2352,6 +2352,7 @@
 properties and rsc/op_defaults hold stuff in a
 meta_attributes child.
 '''
+assert node is not None
 if pnode is None:
 pnode = node
 obj = cib_object_map[pnode.tag][1](pnode.tag)
@@ -2954,7 +2955,8 @@
 if oldnode.getparent() is not None:
 oldnode.getparent().replace(oldnode, newnode)
 obj.nocli = False  # try again after update
-self._adjust_children(obj)
+if not self._adjust_children(obj):
+return False
 if not obj.cli_use_validate():
 common_debug(update_element: validation failed (%s, %s) % (obj, 
etree.tostring(newnode)))
 obj.nocli_warn = True
@@ -3070,33 +3072,56 @@
 '''
 new_children_ids = get_rsc_children_ids(obj.node)
 if not new_children_ids:
-return
+return True
 old_children = [x for x in obj.children if x.parent == obj]
 obj.children = [self.find_object(x) for x in new_children_ids]
 # relink orphans to top
 for child in set(old_children) - set(obj.children):
 common_debug(relink child %s to top % str(child))
 self._relink_child_to_top(child)
-self._update_children(obj)
+if not self._are_children_orphans(obj):
+return False
+return self._update_children(obj)
 
 def _relink_child_to_top(self, obj):
 'Relink a child to the top node.'
 get_topnode(self.cib_elem, obj.parent_type).append(obj.node)
 obj.parent = None
 
+def _are_children_orphans(self, obj):
+
+Check if we're adding a container containing objects
+we've already added to a different 

commit crmsh for openSUSE:Factory

2014-05-15 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-05-15 19:10:28

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  2014-05-14 
10:39:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-05-15 
19:10:29.0 +0200
@@ -1,0 +2,7 @@
+Wed May 14 14:34:56 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_resource: Fix race in start/stop/manage/unmanage (bnc#877640)
+- medium: report: Return to handling timestamps internally (bnc#877495)
+- upstream: 2.0.0-73-g5f04128 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.7Uwjme/_old  2014-05-15 19:10:30.0 +0200
+++ /var/tmp/diff_new_pack.7Uwjme/_new  2014-05-15 19:10:30.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git63
+Version:2.0+git73
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/TODO new/crmsh/TODO
--- old/crmsh/TODO  2014-05-13 16:18:05.0 +0200
+++ new/crmsh/TODO  2014-05-14 16:04:21.0 +0200
@@ -20,15 +20,13 @@
 
 . CIB features
 
-- Rules in primitive attribute declarations
+- Support ACL commands in Pacemaker 1.1.12
 
-primitive dummy ocf:heartbeat:IPaddr2 \
-  params 3: rule 0: #uname eq pcmk-1 nic=eth1 \
-  params 2: rule 1: #uname eq pcmk-2 nic=eth2 \
-  params 1: netmask=32 ip=127.0.0.1 nic=eth0
+. Command features
 
-  Adding parser support is easy.
+- Relative commands: /status from configure, ../resource stop foo
+  from configure, cib/new from configure... for example.
 
-  Difficulty is adding support for multiple sets of parameters
-  with different scores
-  (right now they are all aggregated) in cibconfig.py
+  Tricky part: Have to push/pop levels invisibly, resource
+  commands modify CIB while CIB is edited in configure. Similar
+  races could occur with other commands.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-05-13 16:18:05.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-05-14 16:04:21.0 +0200
@@ -887,6 +887,10 @@
 def __str__(self):
 return %s:%s % (self.obj_type, self.obj_id)
 
+def set_updated(self):
+self.updated = True
+self.propagate_updated()
+
 def _dump_state(self):
 'Print object status'
 print self.state_fmt % (self.obj_id,
@@ -977,10 +981,20 @@
 
 also show rule expressions if found
 '''
+
+has_nvpairs = len(node.xpath('.//nvpair'))  0
+idref = node.get('id-ref')
+
+# empty set
+if not (has_nvpairs or idref is not None):
+return ''
+
 ret = %s  % (clidisplay.keyword(self.set_names[node.tag]))
 node_id = node.get(id)
-if cib_factory.is_id_refd(node.tag, node_id):
+if node_id is not None and cib_factory.is_id_refd(node.tag, node_id):
 ret += %s  % (nvpair_format($id, node_id))
+elif idref is not None:
+ret += %s  % (nvpair_format($id-ref, idref))
 
 score = node.get(score)
 if score:
@@ -1400,9 +1414,7 @@
 node.remove(comment)
 if comments and self.node is not None:
 stuff_comments(self.node, [c.text for c in comments])
-# the resource is updated
-self.updated = True
-self.propagate_updated()
+self.set_updated()
 return self
 
 def del_operation(self, op_node):
@@ -1413,8 +1425,7 @@
 idmgmt.remove_xml(op_node)
 if len(ops_node) == 0:
 rmnode(ops_node)
-self.updated = True
-self.propagate_updated()
+self.set_updated()
 
 def is_dummy_operation(self, op_node):
 '''If the op has just name, id, and interval=0, then it's
@@ -1434,8 +1445,7 @@
 new_op_node = op_obj.mkxml()
 self._append_op(new_op_node)
 # the resource is updated
-self.updated = True
-self.propagate_updated()
+self.set_updated()
 return new_op_node
 
 def del_op_attr(self, op_node, attr_n):
@@ 

commit crmsh for openSUSE:Factory

2014-05-14 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-05-14 10:39:03

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  2014-05-02 
13:54:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-05-14 
10:39:04.0 +0200
@@ -1,0 +2,19 @@
+Tue May 13 17:03:26 UTC 2014 - kgronl...@suse.com
+
+- report: Make regexp groups non-capturing to avoid limit (bnc#877484)
+- constants: Rename cluster attribute to cluster-name (fate#316118)
+- cibconfig: Enable score for instance_attributes (bnc#865292)
+- cibconfig: Support rules in attribute lists (bnc#865292)
+- scripts: Handle percent characters in script output (bnc#876882)
+- parse: Allow 'in' and 'spec' instead of 'in_range' and 'date_spec'
+- upstream: 2.0.0-63-g65d1ad8 
+
+---
+Mon May  5 21:57:04 UTC 2014 - kgronl...@suse.com
+
+- pacemaker: Support Pacemaker XML schema version 2.0
+- hb_report: Fix ssh passwords again (bnc#867365)
+- vars: Add cluster to list of extra cluster properties (fate#316118)
+- upstream: 2.0.0-46-ga05c618ab236 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.oBfPio/_old  2014-05-14 10:39:05.0 +0200
+++ /var/tmp/diff_new_pack.oBfPio/_new  2014-05-14 10:39:05.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git38
+Version:2.0+git63
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
 10700 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-05-02 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-05-02 13:54:46

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  2014-04-20 
11:36:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-05-02 
13:54:47.0 +0200
@@ -1,0 +2,12 @@
+Wed Apr 30 09:10:19 UTC 2014 - kgronl...@suse.com
+
+- ui: Fix garbage characters in prompt (bnc#875788)
+- report: Resolve datetime/timestamp mixup (bnc#874162)
+- parse: Fix check for action/role in resource set parser (bnc#875787)
+- site: pass --force flag through to crm_ticket (bnc#873200)
+- cibconf: add comments in the right order (bnc#866434)
+- parse: Unify API for err() (bnc#875791)
+- crm: Check and complain about python version  2.6
+- upstream: 2.0.0-38-gc2e94fe366a3 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.GxHnEl/_old  2014-05-02 13:54:48.0 +0200
+++ /var/tmp/diff_new_pack.GxHnEl/_new  2014-05-02 13:54:48.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git18
+Version:2.0+git38
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/crm new/crmsh/crm
--- old/crmsh/crm   2014-04-11 09:31:00.0 +0200
+++ new/crmsh/crm   2014-04-30 10:46:19.0 +0200
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-minimum_version = '2.4'
+minimum_version = '2.6'
 import sys
 
 from distutils import version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/clidisplay.py 
new/crmsh/modules/clidisplay.py
--- old/crmsh/modules/clidisplay.py 2014-04-11 09:31:00.0 +0200
+++ new/crmsh/modules/clidisplay.py 2014-04-30 10:46:19.0 +0200
@@ -65,6 +65,11 @@
 return s + ${RLIGNOREBEGIN}${NORMAL}${RLIGNOREEND}
 return s
 
+def prompt_noreadline(self, s):
+if self.colors_enabled():
+return ${GREEN}${BOLD} + s + ${NORMAL}
+return s
+
 def help_header(self, s):
 return self._colorize(s, config.color.help_header)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/main.py new/crmsh/modules/main.py
--- old/crmsh/modules/main.py   2014-04-11 09:31:00.0 +0200
+++ new/crmsh/modules/main.py   2014-04-30 10:46:19.0 +0200
@@ -291,17 +291,19 @@
 rc = 0
 while True:
 try:
+rendered_prompt = vars.prompt
 if options.interactive and not options.batch:
 # TODO: fix how color interacts with readline,
 # seems the color prompt messes it up
 termctrl = TerminalController.getInstance()
 cli_display = CliDisplay.getInstance()
 promptstr = crm(%s)%s#  % (cib_prompt(), context.prompt())
+vars.prompt = promptstr
 if cli_display.colors_enabled():
-vars.prompt = 
termctrl.render(cli_display.prompt(promptstr))
+rendered_prompt = 
termctrl.render(cli_display.prompt(promptstr))
 else:
-vars.prompt = promptstr
-inp = utils.multi_input(vars.prompt)
+rendered_prompt = promptstr
+inp = utils.multi_input(rendered_prompt)
 if inp is None:
 if options.interactive:
 rc = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/parse.py new/crmsh/modules/parse.py
--- old/crmsh/modules/parse.py  2014-04-11 09:31:00.0 +0200
+++ new/crmsh/modules/parse.py  2014-04-30 10:46:19.0 +0200
@@ -977,8 +977,7 @@
 
 def __init__(self, type, s, parent):
 self.parent = parent
-self.type = type
-self.q_attr = (type == order) and action or role
+self.q_attr = type
 self.tokens = s
 self.cli_list = []
 self.reset_set()
@@ -1046,9 +1045,9 @@
 l = [p, '']
 return l
 
-def err(self, token, errmsg):
+def err(self, errmsg, token=''):
 syntax_err(self.parent._cmd,
-   context=self.type,
+  

commit crmsh for openSUSE:Factory

2014-04-20 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-04-20 11:36:51

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  2014-04-09 
13:12:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-04-20 
11:36:52.0 +0200
@@ -1,0 +2,16 @@
+Fri Apr 11 07:58:21 UTC 2014 - kgronl...@suse.com
+
+- hb_report: pcmk lib changed permissions (bnc#872958)
+- history: Use subsecond precision if possible (bnc#872932)
+- history: set colours for all nodes found (bnc#872936)
+- upstream: 2.0.0-18-ga957470950b6
+
+---
+Wed Apr  9 12:37:17 UTC 2014 - kgronl...@suse.com
+
+- parse: Support cib object tags (fate#315101)
+- cibconfig: Support filename-style globs in show/edit (bnc#864346)
+- Support Pacemaker 1.3 schema
+- upstream: 2.0.0-12-g60ed9131ec43
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.c272Ki/_old  2014-04-20 11:36:53.0 +0200
+++ /var/tmp/diff_new_pack.c272Ki/_new  2014-04-20 11:36:53.0 +0200
@@ -41,7 +41,7 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0+git5
+Version:2.0+git18
 Release:%{?crmsh_release}%{?dist}
 Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-04-07 22:28:33.0 +0200
+++ new/crmsh/doc/crm.8.txt 2014-04-11 09:31:00.0 +0200
@@ -2717,6 +2717,24 @@
 op_defaults record-pending=true
 ...
 
+[[cmdhelp_configure_tag,Define resource tags]]
+ `tag`
+
+Define a resource tag. A tag is an id referring to one or more
+resources, without implying any constraints between the tagged
+resources. This can be useful for grouping conceptually related
+resources.
+
+Usage:
+...
+tag tag-name: rsc [rsc ...]
+...
+Example:
+...
+tag web: p-webserver p-vip
+...
+
+
 [[cmdhelp_configure_schema,set or display current CIB RNG schema]]
  `schema`
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/hb_report/ha_cf_support.sh 
new/crmsh/hb_report/ha_cf_support.sh
--- old/crmsh/hb_report/ha_cf_support.sh2014-04-07 22:28:33.0 
+0200
+++ new/crmsh/hb_report/ha_cf_support.sh2014-04-11 09:31:00.0 
+0200
@@ -76,7 +76,7 @@
catEOF
 d $HA_VARLIB 0755 root root
 d $HA_VARLIB/ccm 0750 hacluster haclient
-d $PCMK_LIB 0755 root root
+d $PCMK_LIB 0750 hacluster haclient
 d $PE_STATE_DIR 0750 hacluster haclient
 d $CIB_DIR 0750 hacluster haclient
 EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/hb_report/openais_conf_support.sh 
new/crmsh/hb_report/openais_conf_support.sh
--- old/crmsh/hb_report/openais_conf_support.sh 2014-04-07 22:28:33.0 
+0200
+++ new/crmsh/hb_report/openais_conf_support.sh 2014-04-11 09:31:00.0 
+0200
@@ -90,7 +90,7 @@
 }
 essential_files() {
catEOF
-d $PCMK_LIB 0755 root root
+d $PCMK_LIB 0750 hacluster haclient
 d $PE_STATE_DIR 0750 hacluster haclient
 d $CIB_DIR 0750 hacluster haclient
 EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-04-07 22:28:33.0 +0200
+++ new/crmsh/modules/cibconfig.py  2014-04-11 09:31:00.0 +0200
@@ -20,6 +20,7 @@
 import os
 import sys
 import re
+import fnmatch
 import time
 import config
 from singletonmixin import Singleton
@@ -824,6 +825,7 @@
 utilization: utilization,
 operations: operations,
 op: op,
+tag: tag,
 }
 
 
@@ -1752,7 +1754,8 @@
 for enode in self.node.xpath(rule/expression):
 if enode.get(attribute) == #uname:
 uname = enode.get(value)
-if uname and uname.lower() not in [id.lower() for id in 
cib_factory.node_id_list()]:
+ids = [i.lower() for i in cib_factory.node_id_list()]
+if uname and uname.lower() not in ids:
 common_warn(%s: referenced node %s does not exist % 
(self.obj_id, uname))
 rc = 1
 return rc
@@ -2141,6 +2144,29 @@
   

commit crmsh for openSUSE:Factory

2014-04-09 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-04-09 13:12:07

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  2014-03-28 
16:20:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-04-09 
13:12:08.0 +0200
@@ -1,0 +2,23 @@
+Mon Apr  7 20:40:20 UTC 2014 - kgronl...@suse.com
+
+- utils: Don't crash on missing reply to y/n question (bnc#872380)
+- ui_resource: Don't create extra nvpairs (bnc#865024)
+- Allow building without PyYAML on targets that lack it
+- upstream: 2.0.0-5-g69af99663efd
+
+---
+Mon Apr  7 06:20:51 UTC 2014 - kgronl...@suse.com
+
+- Upstream release 2.0
+- Upstream moved to http://crmsh.github.io
+- upstream cs: 0baa5a6 
+
+---
+Thu Apr  3 08:13:03 UTC 2014 - kgronl...@suse.com
+
+- history: Improve output when using crm_report (bnc#870886)
+- make sanity check of node name not case sensitive 
+- hb_report: Don't use deprecated ifconfig (bnc#871089)
+- upstream cs: e4d5b0a985fa 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.T8tyHf/_old  2014-04-09 13:12:09.0 +0200
+++ /var/tmp/diff_new_pack.T8tyHf/_new  2014-04-09 13:12:09.0 +0200
@@ -41,9 +41,9 @@
 Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:2.0
+Version:2.0+git5
 Release:%{?crmsh_release}%{?dist}
-Url:http://savannah.nongnu.org/projects/crmsh
+Url:http://crmsh.github.io
 Source0:crmsh.tar.bz2
 # PATCH-FEATURE-OPENSUSE crmsh-cibadmin_can_patch.patch
 # de...@suse.de -- enable atomic CIB updates here, because our
@@ -53,14 +53,14 @@
 Requires(pre):  pacemaker
 Requires:   pssh
 Requires:   python = 2.6
-Requires:   python-PyYAML
 Requires:   python-dateutil
 Requires:   python-lxml
 Requires:   which
-BuildRequires:  python-PyYAML
 BuildRequires:  python-lxml
 
 %if 0%{?suse_version}
+Requires:   python-PyYAML
+BuildRequires:  python-PyYAML
 # Suse splits this off into a separate package
 Requires:   python-curses
 BuildRequires:  fdupes
@@ -72,6 +72,11 @@
 BuildRequires:  pacemaker-libs-devel
 %endif
 
+%if 0%{?fedora_version}
+Requires:   PyYAML
+BuildRequires:  PyYAML
+%endif
+
 # Required for core functionality
 BuildRequires:  asciidoc
 BuildRequires:  autoconf

++ crmsh.tar.bz2 ++
 4689 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-03-28 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-03-28 16:20:57

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  2014-03-18 
14:13:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-03-28 
16:20:58.0 +0100
@@ -1,0 +2,8 @@
+Thu Mar 27 23:33:58 UTC 2014 - kgronl...@suse.com
+
+- medium: Enhanced configure syntax (bnc#870753)
+- medium: Display without class:provider: prefix if possible (bnc#870755)
+- low: Better args error handling in configure load/save (bnc#870654)
+- upstream cs: f3309a48f199
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2014-03-17 13:09:30.0 +0100
+++ new/crmsh/.hg_archival.txt  2014-03-28 00:18:14.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 053db64d9cca33de61567a117573c69079345628
+node: f3309a48f1994938d8be5d8aae2aa470a4ee415c
 branch: default
 latesttag: 1.2.6-rc1
-latesttagdistance: 476
+latesttagdistance: 489
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-03-17 13:09:30.0 +0100
+++ new/crmsh/doc/crm.8.txt 2014-03-28 00:18:14.0 +0100
@@ -12,7 +12,7 @@
 
 SYNOPSIS
 
-*crm* [OPTIONS] [ARGS...]
+*crm* [OPTIONS] [SUBCOMMAND ARGS...]
 
 
 [[topics_Description,Program description]]
@@ -100,13 +100,12 @@
 Print crmsh version and build information (Mercurial Hg changeset
 hash).
 
-*-R, --regression-tests*::
-Run in the regression test mode. Used mainly by the regression
-testing suite.
-
 *-d, --debug*::
-Print some debug information. Used by developers. [Not yet refined
-enough to print useful information for other users.]
+Print verbose debugging information.
+
+*-R, --regression-tests*::
+Enables extra verbose trace logging used by the regression
+tests. Logs all external calls made by crmsh.
 
 *--scriptdir*='DIR'::
 Extra directory where crm looks for cluster scripts. Can be a semi-colon
@@ -312,9 +311,9 @@
 configuration:
 ...
 crm(live)configure template# show
-primitive virtual-ip ocf:heartbeat:IPaddr \
-params ip=192.168.1.101
-primitive apache ocf:heartbeat:apache \
+primitive virtual-ip IPaddr \
+params ip=192.168.1.101
+primitive apache apache \
 params configfile=/etc/apache2/httpd.conf
 monitor apache 120s:60s
 group websvc \
@@ -339,11 +338,11 @@
 crm(live)configure# show
 node xen-b
 node xen-c
-primitive apache ocf:heartbeat:apache \
+primitive apache apache \
 params configfile=/etc/apache2/httpd.conf \
-op monitor interval=120s timeout=60s
-primitive virtual-ip ocf:heartbeat:IPaddr \
-params ip=192.168.1.101
+op monitor interval=120s timeout=60s
+primitive virtual-ip IPaddr \
+params ip=192.168.1.101
 group websvc apache virtual-ip
 ...
 
@@ -365,11 +364,11 @@
 crm(live)configure# show
 node xen-b
 node xen-c
-primitive apache ocf:heartbeat:apache \
+primitive apache apache \
 params configfile=/etc/apache2/httpd.conf \
-op monitor interval=120s timeout=60s
-primitive intranet-ip ocf:heartbeat:IPaddr \
-params ip=192.168.1.101
+op monitor interval=120s timeout=60s
+primitive intranet-ip IPaddr \
+params ip=192.168.1.101
 group websvc apache intranet-ip
 location websvc-pref websvc 100: xen-b
 ...
@@ -399,16 +398,16 @@
 primitive fencer stonith:external/libvirt \
 params hypervisor_uri=qemu+tcp://10.2.13.1/system \
 hostlist=xen-b xen-c xen-d \
-op monitor interval=2h
-primitive svc ocf:heartbeat:Xinetd \
-params service=systat \
-op monitor interval=30s
-primitive intranet-ip ocf:heartbeat:IPaddr2 \
-params ip=10.2.13.100 \
-op monitor interval=30s
-primitive apache ocf:heartbeat:apache \
+op monitor interval=2h
+primitive svc Xinetd \
+params service=systat \
+op monitor interval=30s
+primitive intranet-ip IPaddr2 \
+params ip=10.2.13.100 \
+op monitor interval=30s
+primitive apache apache \
 params configfile=/etc/apache2/httpd.conf \
-op monitor interval=120s timeout=60s
+op monitor interval=120s timeout=60s
 group websvc apache intranet-ip
 location websvc-pref websvc 100: xen-b
 ...
@@ -431,7 +430,7 @@
 possible to tell Pacemaker not to start 

commit crmsh for openSUSE:Factory

2014-03-18 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-03-18 14:13: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  2014-03-10 
12:31:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-03-18 
14:13:42.0 +0100
@@ -1,0 +2,21 @@
+Mon Mar 17 12:53:00 UTC 2014 - kgronl...@suse.com
+
+- medium: command: Propagate error from auto-commit (bnc#868533)
+- medium: crm_pkg: Add --no-refresh to zypper commands
+- medium: scripts: Improved setup in cluster init/add (bnc#868008)
+- upstream cs: 053db64d9cca
+
+---
+Thu Mar 13 14:51:40 UTC 2014 - kgronl...@suse.com
+
+- medium: scripts: Improved debug output from cluster scripts (bnc#866636)
+- medium: scripts: corosync uses mcastport - 1 (bnc#868008)
+- medium: xmlutil: fencing-topology used broken comparison (bnc#866639)
+- medium: utils: ask() did not respect force flag in all cases (bnc#868007)
+- low: utils: Nicer warning when crm_simulate fails
+- low: ui: Don't call nonexistent function on unsupported cluster stack
+- low: main: Better descriptions for -d and -R flags.
+- low: parse: More liberal parsing of role assignment in constraint rules
+- upstream cs: dbf8e3b7538 
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2014-03-08 14:13:37.0 +0100
+++ new/crmsh/.hg_archival.txt  2014-03-17 13:09:30.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 4bb659cf287e386310ecb8894f2c4f5ab95755d4
+node: 053db64d9cca33de61567a117573c69079345628
 branch: default
 latesttag: 1.2.6-rc1
-latesttagdistance: 462
+latesttagdistance: 476
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/command.py new/crmsh/modules/command.py
--- old/crmsh/modules/command.py2014-03-08 14:13:37.0 +0100
+++ new/crmsh/modules/command.py2014-03-17 13:09:30.0 +0100
@@ -247,8 +247,9 @@
 TODO: Implement full cd navigation. cd ../configure, for example
 Also implement ls to list commands / levels from current location
 '''
-context.up()
+ok = context.up()
 context.save_stack()
+return ok
 
 @help('''List levels and commands
 Lists the available sublevels and commands
@@ -289,22 +290,26 @@
 ''')
 @completer(_cd_completer)
 def do_cd(self, context, optarg='..'):
+ok = True
 path = optarg.split('/', 1)
 if len(path) == 1:
 path = path[0]
 if path == '..':
-context.up()
+ok = context.up()
 elif path == '.' or not path:
-return
+return ok
 else:
 info = self.get_child(path)
 if not info or not info.level:
 context.fatal_error(No such level:  + path)
 context.enter_level(info.level)
 else:
-self.do_cd(context, path[0])
-self.do_cd(context, path[1])
+if not self.do_cd(context, path[0]):
+ok = False
+if not self.do_cd(context, path[1]):
+ok = False
 context.save_stack()
+return True
 
 @alias('bye', 'exit')
 @help('''Exit the interactive shell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/main.py new/crmsh/modules/main.py
--- old/crmsh/modules/main.py   2014-03-08 14:13:37.0 +0100
+++ new/crmsh/modules/main.py   2014-03-17 13:09:30.0 +0100
@@ -180,13 +180,12 @@
 Print Pacemaker version and build information (Mercurial Hg
 changeset hash).
 
--R, --regression-tests::
-Run in the regression test mode. Used mainly by the
-regression testing suite.
-
 -d, --debug::
-Print some debug information. Used by developers. [Not yet
-refined enough to print useful information for other users.]
+Print verbose debugging information.
+
+-R, --regression-tests::
+Enables extra verbose trace logging used by the regression
+tests. Logs all external calls made by crmsh.
 
 --scriptdir='DIR'::
 Extra directory where crm looks for cluster scripts. Can be
@@ -217,7 +216,7 @@
 
 def 

commit crmsh for openSUSE:Factory

2014-03-10 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-03-10 12:31:14

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  2014-03-07 
07:04:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-03-10 
12:31:24.0 +0100
@@ -1,0 +2,6 @@
+Sat Mar  8 20:03:30 UTC 2014 - kgronl...@suse.com
+
+- high: xmlutil: Improved XML comparison function (bnc#866434)
+- upstream cs: 4bb659cf287e 
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2014-03-06 17:19:54.0 +0100
+++ new/crmsh/.hg_archival.txt  2014-03-08 14:13:37.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: dad87af7e64ba415b13edce29dceb53747139720
+node: 4bb659cf287e386310ecb8894f2c4f5ab95755d4
 branch: default
 latesttag: 1.2.6-rc1
-latesttagdistance: 457
+latesttagdistance: 462
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-03-06 17:19:54.0 +0100
+++ new/crmsh/modules/cibconfig.py  2014-03-08 14:13:37.0 +0100
@@ -53,7 +53,7 @@
 from xmlutil import remove_id_used_attributes, get_top_cib_nodes, 
set_id_used_attr
 from xmlutil import merge_attributes, is_cib_element, sanity_check_meta, 
add_missing_attr
 from xmlutil import is_simpleconstraint, is_template, rmnode, is_defaults, 
is_live_cib
-from xmlutil import get_rsc_operations, delete_rscref, xml_cmp, lookup_node, 
RscState
+from xmlutil import get_rsc_operations, delete_rscref, xml_equals, 
lookup_node, RscState
 from xmlutil import cibtext2elem
 from cliformat import get_score, nvpairs2list, abs_pos_score, cli_acl_roleref, 
nvpair_format
 from cliformat import cli_acl_rule, cli_pairs, rsc_set_constraint, get_kind
@@ -410,15 +410,15 @@
 not_allowed = id_set  self.locked_ids
 rscstat = RscState()
 if not_allowed:
-common_err(elements %s already exist %
-   ','.join(list(not_allowed)))
+common_err(Elements %s already exist %
+   ', '.join(list(not_allowed)))
 rc = False
 delete_set = self.obj_ids - id_set
 cannot_delete = [x for x in delete_set
  if not rscstat.can_delete(x)]
 if cannot_delete:
-common_err(cannot delete running resources: %s %
-   ','.join(cannot_delete))
+common_err(Cannot delete running resources: %s %
+   ', '.join(cannot_delete))
 rc = False
 return rc
 
@@ -526,6 +526,7 @@
 return rc
 mk_set = id_set - self.obj_ids
 upd_set = id_set  self.obj_ids
+
 rc = cib_factory.set_update(edit_d, mk_set, upd_set, del_set,
 upd_type=cli, method=method)
 if not rc:
@@ -1110,8 +,7 @@
 xml2 = self.cli2node(cli_text)
 if xml2 is None:
 return False
-rc = xml_cmp(self.node, xml2, show=True)
-return rc
+return xml_equals(self.node, xml2, show=True)
 
 def _verify_op_attributes(self, op_node):
 '''
@@ -3098,7 +3098,7 @@
 id_store.replace_xml(newnode, obj.node)
 return False
 oldnode = obj.node
-if xml_cmp(oldnode, newnode):
+if xml_equals(oldnode, newnode):
 if newnode.getparent() is not None:
 newnode.getparent().remove(newnode)
 return True  # the new and the old versions are equal
@@ -3140,20 +3140,25 @@
 for cli in processing_sort_cli([edit_d[x] for x in mk_set]):
 obj = self.create_from_cli(cli)
 if not obj:
+common_debug(create_from_cli '%s' failed % (cli))
 return False
 test_l.append(obj)
 for id in upd_set:
 obj = self.find_object(id)
 if not obj:
+common_debug(%s not found! % (id))
 return False
 if not self.update_from_cli(obj, edit_d[id], method):
+common_debug(update_from_cli failed: %s, %s, %s % (obj, 
edit_d[id], method))
 return False
 test_l.append(obj)
 if not self.delete(*list(del_set)):
+

commit crmsh for openSUSE:Factory

2014-03-06 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-03-07 07:04:38

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  2014-02-20 
06:21:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-03-07 
07:04:40.0 +0100
@@ -1,0 +2,14 @@
+Thu Mar  6 15:47:48 UTC 2014 - kgronl...@suse.com
+
+- high: xmlutil: Don't strip comments from CIB (bnc#866434)
+- medium: xmlutil: order-independent XML comparison (bnc#866434)
+- test: Improved unit tests (bnc#866434) (bnc#865024)
+- medium: scripts: fix bugs in init script (bnc#866569)
+- medium: scripts: enable trace logging for cluster scripts (bnc#866636)
+- low: xmlutil: don't crash on degenerate colocations
+- low: ui_cluster: use crm_mon -bD1 in wait_for_cluster (bnc#866635)
+- low: utils: Record all calls in regression test output (bnc#862383)
+- medium: ui_resource: Add resource maintenance command (bnc#863071)
+- upstream cs: dad87af7e64b
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
 4085 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-02-19 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-02-20 06:21:08

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  2014-02-17 
12:52:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-02-20 
06:21:10.0 +0100
@@ -1,0 +2,7 @@
+Wed Feb 19 09:26:01 UTC 2014 - kgronl...@suse.com
+
+- high: scripts: Disable strict host key checking (bnc#864268)
+- high: parse: Fix resource sets displaying as XML (savannah#41617) 
(bnc#864563)
+- upstream cs: 6daeb2253a4a 
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2014-02-13 16:16:00.0 +0100
+++ new/crmsh/.hg_archival.txt  2014-02-19 10:20:53.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 364c59ee0612e71579ffacbdf628022043e61ba6
+node: 6daeb2253a4a6e050f41ae1df895eb6b030a5eba
 branch: default
 latesttag: 1.2.6-rc1
-latesttagdistance: 425
+latesttagdistance: 427
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-02-13 16:16:00.0 +0100
+++ new/crmsh/doc/crm.8.txt 2014-02-19 10:20:53.0 +0100
@@ -2118,6 +2118,42 @@
 node big_node attributes memory=64
 ...
 
+ Resource sets
+
+Using resource sets can be a bit confusing unless one knows the
+details of the implementation in Pacemaker as well as how to interpret
+the syntax provided by `crmsh`.
+
+Three different types of resource sets are provided by `crmsh`, and
+each one implies different values for the two resource set attributes,
+`sequential` and `require-all`.
+
+`sequential`::
+  If true, the resources in the set do not depend on each other
+  internally. Setting `sequential` to true implies a strict order of
+  dependency within the set.
+
+`require-all`::
+  If false, only one resource in the set is required to fulfil the
+  requirements of the set. The set of `A, B and C` with `require-all`
+  set to `false` is be read as `A OR B OR C` when its dependencies
+  are resolved.
+
+The three types of resource sets modify the attributes in the
+following way:
+
+1. Implicit sets (no brackets). `sequential=true`, `require-all=true`
+2. Parenthesis set (`( ... )`). `sequential=false`, `require-all=true`
+3. Bracket set (`[ ... ]`). `sequential=false`, `require-all=false`
+
+To create a set with the properties `sequential=true` and
+`require-all=false`, explicitly set `sequential` in a bracketed set,
+`[ A B C sequential=true ]`.
+
+To create multiple sets with both `sequential` and `require-all` set to
+true, explicitly set `sequential` in a parenthesis set:
+`A B ( C D sequential=true )`.
+
 [[cmdhelp_configure_primitive,define a resource]]
  `primitive`
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cliformat.py 
new/crmsh/modules/cliformat.py
--- old/crmsh/modules/cliformat.py  2014-02-13 16:16:00.0 +0100
+++ new/crmsh/modules/cliformat.py  2014-02-19 10:20:53.0 +0100
@@ -234,18 +234,22 @@
 return rsc
 
 
+def boolean_maybe(v):
+returns True/False or None
+if v is None:
+return None
+return utils.get_boolean(v)
+
+
 def rsc_set_constraint(node, obj_type):
 col = []
 cnt = 0
 for n in node.findall(resource_set):
-add_seq = False
-sequential = utils.get_boolean(n.get(sequential), True)
-require_all = utils.get_boolean(n.get(require-all), True)
-if not require_all:
+sequential = boolean_maybe(n.get(sequential))
+require_all = boolean_maybe(n.get(require-all))
+if require_all is False:
 col.append([)
-if sequential:
-add_seq = True
-elif not sequential:
+elif sequential is False:
 col.append(()
 role = n.get(role)
 action = n.get(action)
@@ -254,15 +258,18 @@
 q = (obj_type == order) and action or role
 col.append(q and %s:%s % (rsc, q) or rsc)
 cnt += 1
-if not require_all:
-if add_seq:
+if require_all is False:
+if sequential in (None, True):
 col.append('sequential=true')
 col.append(])
-elif not sequential:
+elif sequential 

commit crmsh for openSUSE:Factory

2014-02-17 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-02-17 12:52:26

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  2014-02-11 
11:03:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-02-17 
12:52:27.0 +0100
@@ -1,0 +2,16 @@
+Thu Feb 13 15:20:02 UTC 2014 - kgronl...@suse.com
+
+- medium: hb_report: Fix incorrect quotes (bnc#863816)
+- upstream cs: 364c59ee0612 
+
+---
+Thu Feb 13 10:34:21 UTC 2014 - kgronl...@suse.com
+
+- spec: Require python = 2.6
+- high: cibconfig: Handle non-string arguments (bnc#863736)
+- low: cibconfig: do not format xml tags when requested (bnc#863746)
+- medium: ui_root: Rename root level to 'root' (bnc#863583)
+- doc: manpages: Section name broke docbook generation (bnc#863055)
+- upstream cs: 6545c6fc8bf6 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.okWM6e/_old  2014-02-17 12:52:28.0 +0100
+++ /var/tmp/diff_new_pack.okWM6e/_new  2014-02-17 12:52:28.0 +0100
@@ -52,7 +52,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  pacemaker
 Requires:   pssh
-Requires:   python = 2.4
+Requires:   python = 2.6
 Requires:   python-PyYAML
 Requires:   python-dateutil
 Requires:   python-lxml

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2014-02-10 08:37:44.0 +0100
+++ new/crmsh/.hg_archival.txt  2014-02-13 16:16:00.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 49572fb0f7bbf6fce9cf3df967799c2132f109bb
+node: 364c59ee0612e71579ffacbdf628022043e61ba6
 branch: default
 latesttag: 1.2.6-rc1
-latesttagdistance: 415
+latesttagdistance: 425
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/crmsh.spec new/crmsh/crmsh.spec
--- old/crmsh/crmsh.spec2014-02-10 08:37:44.0 +0100
+++ new/crmsh/crmsh.spec2014-02-13 16:16:00.0 +0100
@@ -52,7 +52,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  pacemaker
 Requires:   pssh
-Requires:   python = 2.4
+Requires:   python = 2.6
 Requires:   python-PyYAML
 Requires:   python-dateutil
 Requires:   python-lxml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-02-10 08:37:44.0 +0100
+++ new/crmsh/doc/crm.8.txt 2014-02-13 16:16:00.0 +0100
@@ -617,7 +617,7 @@
 repeated, `|` means pick one of many, and the rest are literals
 (strings, `:`, `=`).
 
-[[cmdhelp_._status,Cluster status]]
+[[cmdhelp_root_status,Cluster status]]
 === `status`
 
 Show cluster status. The status is displayed by `crm_mon`. Supply
@@ -3131,9 +3131,10 @@
 
 Usage:
 ...
-new config template [template ...] [params name=value ...]
+new config template [template ...] [params name=value ...]
 ...
-Examples:
+
+Example:
 ...
 new vip virtual-ip
 new bigfs ocfs2 params device=/dev/sdx8 directory=/bigfs
@@ -3500,7 +3501,9 @@
 
 If you think you may have found a bug or just need clarification
 from developers or your support, the `session pack` command can
-help create a report. This is an example:
+help create a report.
+
+Example:
 ...
 crm(live)history# timeframe Jul 18 12:00 Jul 18 12:30
 crm(live)history# session save strange_restart
@@ -3508,6 +3511,7 @@
 Report saved in .../strange_restart.tar.bz2
 crm(live)history# 
 ...
+
 In order to reduce report size and allow developers to
 concentrate on the issue, you should beforehand limit the time
 frame. Giving a meaningful session name helps too.
@@ -3931,7 +3935,7 @@
 session list
 ...
 
-[[cmdhelp_._report,Create cluster status report]]
+[[cmdhelp_root_report,Create cluster status report]]
 === `report`
 
 Interface to a tool for creating a cluster report. A report is an
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/hb_report/hb_report.in 
new/crmsh/hb_report/hb_report.in
--- old/crmsh/hb_report/hb_report.in2014-02-10 08:37:44.0 +0100
+++ new/crmsh/hb_report/hb_report.in2014-02-13 16:16:00.0 +0100
@@ -26,7 +26,7 @@
 unset LANG
 export 

commit crmsh for openSUSE:Factory

2014-02-11 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-02-11 11:03:14

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  2014-02-03 
16:12:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-02-11 
11:03:15.0 +0100
@@ -1,0 +2,18 @@
+Mon Feb 10 08:16:12 UTC 2014 - kgronl...@suse.com
+
+- tests: run CIB tests with regression test suite
+- upstream cs: 49572fb0f7bb
+
+---
+Thu Feb  6 14:34:20 UTC 2014 - kgronl...@suse.com
+
+- high: parse: Fix sequential=true for resource sets (bnc#862334)
+- medium: corosync: Allow tabs in corosync.conf (bnc#862577)
+- low: cibconfig: fencing_topology warning with stonith templates 
(savannah#41414)
+- spec: update description of crmsh package
+- tests: split regression tests into separate -test package
+- tests: use python-nose as unit test runner
+- tests: improved unit test coverage
+- upstream cs: cc52dc69ceb1 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.5KHNen/_old  2014-02-11 11:03:15.0 +0100
+++ /var/tmp/diff_new_pack.5KHNen/_new  2014-02-11 11:03:15.0 +0100
@@ -38,7 +38,7 @@
 %{!?py_sitedir: %{expand: %%global py_sitedir  
%%{expand:{py_libdir}/site-packages}}}
 
 Name:   crmsh
-Summary:Pacemaker command line interface
+Summary:High Availability cluster command-line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
 Version:2.0
@@ -86,20 +86,32 @@
 BuildRequires:  libxslt-tools
 %endif
 
+%description
+The crm shell is a command-line interface for High-Availability
+cluster management on GNU/Linux systems. It simplifies the
+configuration, management and troubleshooting of Pacemaker-based
+clusters, by providing a powerful and intuitive set of features.
+
+Authors: Dejan Muhamedagic de...@suse.de and many others
+
+%package test
+Summary:Test package for crmsh
+Group:  %{pkg_group}
+Requires:   crmsh
 %if 0%{?with_regression_tests}
 BuildRequires:  corosync
 BuildRequires:  procps
 BuildRequires:  python-dateutil
+BuildRequires:  python-nose
 BuildRequires:  vim
 Requires:   pacemaker
 Requires:   pssh
 %endif
-
-%description
-crm shell, a Pacemaker command line interface.
-
-Pacemaker is an advanced, scalable High-Availability cluster resource
-manager for Heartbeat and/or Corosync.
+%description test
+The crm shell is a command-line interface for High-Availability
+cluster management on GNU/Linux systems. It simplifies the
+configuration, management and troubleshooting of Pacemaker-based
+clusters, by providing a powerful and intuitive set of features.
 
 Authors: Dejan Muhamedagic de...@suse.de and many others
 
@@ -140,8 +152,9 @@
 make %{_smp_mflags} docdir=%{crmsh_docdir}
 
 %if 0%{?with_regression_tests}
-if ! test/unittests/testrunner.py ; then
-echo Shell unit tests failed.
+   ./test/unit-tests.sh --quiet
+if [ ! $? ]; then
+echo Unit tests failed.
 exit 1
 fi
 %endif
@@ -159,14 +172,19 @@
 # Run regression tests after installing the package
 # NB: this is called twice by OBS, that's why we touch the file
 %if 0%{?with_regression_tests}
-%post
+%post test
 if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
 touch /tmp/.crmsh_regression_tests_ran
 if ! %{_datadir}/%{name}/tests/regression.sh ; then
-echo Shell tests failed.
+echo Regression tests failed.
 cat crmtestout/regression.out
 exit 1
 fi
+   cd %{_datadir}/%{name}/tests
+   if ! ./cib-tests.sh ; then
+   echo CIB tests failed.
+   exit 1
+   fi
 fi
 %endif
 
@@ -178,6 +196,7 @@
 %{py_sitedir}/crmsh
 
 %{_datadir}/%{name}
+%exclude %{_datadir}/%{name}/tests
 
 %doc %{_mandir}/man8/*
 %{crmsh_docdir}/COPYING
@@ -195,4 +214,8 @@
 %dir %attr (770, %{uname}, %{gname}) %{_var}/cache/crm
 %config %{_sysconfdir}/bash_completion.d/crm.sh
 
+%files test
+%defattr(-,root,root)
+%{_datadir}/%{name}/tests
+
 %changelog

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2014-02-01 00:11:56.0 +0100
+++ new/crmsh/.hg_archival.txt  2014-02-10 08:37:44.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 170f0ff108dfe5d186092d023f389bf813490bfe
+node: 

commit crmsh for openSUSE:Factory

2014-02-03 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-02-03 16:12:04

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  2014-01-23 
15:41:06.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-02-03 
16:12:05.0 +0100
@@ -1,0 +2,11 @@
+Mon Feb  3 07:55:51 UTC 2014 - kgronl...@suse.com
+
+- medium: xmlutil: rsc_template has no provider attribute (savannah#41410)
+- doc: ui_configure: Document the type: prefix argument to configure show 
(bnc#861776)
+- medium: ra: Infer provider from RA name (bnc#860754)
+- low: ui_options: add missing documentation for options set (bnc#860585)
+- medium: ui_cib: correct name of cib import (bnc#860584)
+- medium: ui_ra: Fix problems with ra info command (bnc#860583)
+- upstream cs: 3bf6bc6b82ad
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2014-01-21 18:01:41.0 +0100
+++ new/crmsh/.hg_archival.txt  2014-02-01 00:11:56.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: fdf3c08dc5e2c9c4e2bbb48ea20d52ebc76f6b28
+node: 170f0ff108dfe5d186092d023f389bf813490bfe
 branch: default
 latesttag: 1.2.6-rc1
-latesttagdistance: 393
+latesttagdistance: 400
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2014-01-21 18:01:41.0 +0100
+++ new/crmsh/doc/crm.8.txt 2014-02-01 00:11:56.0 +0100
@@ -1169,7 +1169,7 @@
 list ocf pacemaker
 ...
 
-[[cmdhelp_ra_meta,show meta data for a RA]]
+[[cmdhelp_ra_info,show meta data for a RA]]
  `info` (`meta`)
 
 Show the meta-data of a resource agent type. This is where users
@@ -1987,11 +1987,36 @@
 
 Usage:
 
+show [all|option]
+
+
+Example:
+
 show
 show skill-level
 show all
 
 
+[[cmdhelp_options_set,Set the value of a given option]]
+ `set`
+
+Sets the value of an option. Takes the fully qualified
+name of the option as argument, as displayed by `show all`.
+
+The modified option value is stored in the user-local
+configuration file, usually found in `~/.config/crm/crm.conf`.
+
+Usage:
+
+set option value
+
+
+Example:
+
+set color.warn magenta bold
+set editor nano
+
+
 [[cmdhelp_options_save,save the user preferences to the rc file]]
  `save`
 
@@ -2664,8 +2689,11 @@
 The `show` command displays objects. It may display all objects
 or a set of objects. The user may also choose to see only objects
 which were changed.
+
 Optionally, the XML code may be displayed instead of the CLI
-representation.
+representation by passing `xml` as the first argument.
+
+To show all objects of a certain type, use the `type:` prefix.
 
 Usage:
 ...
@@ -2673,6 +2701,13 @@
 show [xml] changed
 ...
 
+Example:
+...
+show webapp
+show type:primitive
+show xml type:node
+...
+
 [[cmdhelp_configure_edit,edit CIB objects]]
  `edit`
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2014-01-21 18:01:41.0 +0100
+++ new/crmsh/modules/cibconfig.py  2014-02-01 00:11:56.0 +0100
@@ -2597,6 +2597,10 @@
 List of ids (for completion).
 return [x.obj_id for x in self.cib_objects]
 
+def type_list(self):
+List of object types (for completion)
+return list(set([x.obj_type for x in self.cib_objects]))
+
 def prim_id_list(self):
 List of primitives ids (for group completion).
 return [x.obj_id for x in self.cib_objects if x.obj_type == 
primitive]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/ra.py new/crmsh/modules/ra.py
--- old/crmsh/modules/ra.py 2014-01-21 18:01:41.0 +0100
+++ new/crmsh/modules/ra.py 2014-02-01 00:11:56.0 +0100
@@ -794,6 +794,20 @@
 return True
 
 
+def pick_provider(providers):
+'''
+Pick the most appropriate choice from a
+list of providers, falling back to
+'heartbeat' if no good choice is found
+'''
+if not providers:
+return 'heartbeat'
+for pick in ('heartbeat', 'pacemaker'):
+if pick in 

commit crmsh for openSUSE:Factory

2014-01-23 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-01-22 13:43:44

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  2014-01-13 
12:00:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-01-23 
15:41:06.0 +0100
@@ -1,0 +2,59 @@
+Tue Jan 21 17:06:48 UTC 2014 - kgronl...@suse.com
+
+- medium: scripts: Updated health script (fate#309206)
+- medium: ui_corosync: Fix corosync.log
+- medium: config: Fix bug preventing load of crm.conf
+- low: xmlutil: fix unescaped backslash in listshadows()
+- upstream cs: fdf3c08dc5e2 
+
+---
+Tue Jan 21 09:21:42 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_resource: Fix crash in resource cleanup (bnc#859570)
+- upstream cs: 693938052ee8
+
+---
+Mon Jan 20 17:09:34 UTC 2014 - kgronl...@suse.com
+
+- medium: ui_assist: Add assist sublevel (fate#314917)
+- low: ui: Tab completion for new commands
+- upstream cs: efa56d142298 
+
+---
+Mon Jan 20 12:03:43 UTC 2014 - kgronl...@suse.com
+
+- medium: report: call corosync-blackbox, not corosync-fplay
+- medium: report: Move report command to cli root
+- medium: report: Open reports output by crm_report (fate#316330)
+- medium: parse: Fix bugs in parsing uppercase input
+- medium: hb_report: Install manpage for crmsh_hb_report
+- medium: scripts: Add --scriptdir command line option
+- medium: scripts: Support sudo in scripts
+- low: report: Show progress when processing many transitions
+- low: doc: add documentation on single-stepping cluster scripts
+- upstream cs: f3c81a0ba50b 
+
+---
+Thu Jan 16 15:38:13 UTC 2014 - kgronl...@suse.com
+
+- medium: help: Bug in delayed loading of help text
+- medium: ui_corosync: new commands: add-node, del-node,
+  set, get
+- Medium: corosync: Better parser
+- medium: scripts: implemented cluster add script
+- low: scripts: handle removing multiple nodes at once
+- Medium: scripts: Improved syntax for cluster scripts
+- Doc: Update cluster script example and documentation
+- Medium: scripts: New node remove script
+- upstream cs: a10e109c4c04 
+
+---
+Tue Jan 14 01:02:39 UTC 2014 - kgronl...@suse.com
+
+- Medium: ui_resource: Fix bug in resource restart
+- Medium: ui_corosync: add log command
+- Medium: scripts: Allow more compact syntax for steps
+- Medium: scripts: Clean up after remote script execution
+- upstream cs: 7cd5688c164d 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Ti3zPe/_old  2014-01-23 15:41:07.0 +0100
+++ /var/tmp/diff_new_pack.Ti3zPe/_new  2014-01-23 15:41:07.0 +0100
@@ -183,12 +183,12 @@
 %{crmsh_docdir}/COPYING
 %{crmsh_docdir}/AUTHORS
 %{crmsh_docdir}/crm.8.html
+%{crmsh_docdir}/crmsh_hb_report.8.html
 %{crmsh_docdir}/ChangeLog
 %{crmsh_docdir}/README
 %{crmsh_docdir}/contrib/*
 
-%{_sysconfdir}/crm
-%config %{_sysconfdir}/crm/crm.conf
+%config %{_sysconfdir}/crm
 
 %dir %{crmsh_docdir}
 %dir %{crmsh_docdir}/contrib

++ crmsh.tar.bz2 ++
 7624 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2014-01-13 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2014-01-13 12:00:42

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  2013-12-30 
09:50:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-01-13 
12:00:42.0 +0100
@@ -1,0 +2,21 @@
+Fri Jan 10 05:10:16 UTC 2014 - kgronl...@suse.com
+
+- High: scripts: Cluster scripts (fate#316464, fate#309206, fate#316332)
+- Medium: help: Return error if help topic is not found (bug#40821)
+- Medium: crm_gv: Support rsc_template in graphs (bnc#850159)
+- Low: config: Validate boolean values correctly
+- Low: main: Seed random generator on startup
+- Low: main: More informative error on start failure
+- Low: cluster: Use crm_node -l for node list
+- Low: ui_cib: Fix typo in sublevel name: cib.cibconfig - cib.cibstatus
+- Doc: Updated documentation
+- upstream cs: d2314df6e8a2
+
+---
+Thu Jan  2 09:57:29 UTC 2014 - kgronl...@suse.com
+
+- Medium: cibconfig: Updated fix for configure load method (bnc#841764)
+- Low: parse: Correct recognition of kind in order constraints
+- upstream cs: cfd8529e182b
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.xRGmHo/_old  2014-01-13 12:00:43.0 +0100
+++ /var/tmp/diff_new_pack.xRGmHo/_new  2014-01-13 12:00:43.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package crmsh
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ crmsh.tar.bz2 ++
 6760 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2013-12-30 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-12-30 09:49:59

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  2013-12-10 
17:42:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-12-30 
09:50:00.0 +0100
@@ -1,0 +2,18 @@
+Fri Dec 20 10:11:42 UTC 2013 - kgronl...@suse.com
+
+- Medium: ui_report: Fix bug when calling hb_report in report sublevel
+- Medium: ui_history: Fix bug when checking current sublevel in 
+  history commands
+- upstream cs: 809d4b774bd4
+
+---
+Tue Dec 17 16:48:30 UTC 2013 - kgronl...@suse.com
+
+- Medium: parse: Resource sets in location constraints (fate#315158)
+- Medium: parse: Regular expressions in location constraints
+- Dev: unittests: Run unit tests with regression builds
+- Low: parse: Stricter parsing of resource names
+- Low: utils: Look for crmd in config.path.crm_daemon_dir
+- upstream cs: 0d3abc34b627 
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.uGQQJ3/_old  2013-12-30 09:50:01.0 +0100
+++ /var/tmp/diff_new_pack.uGQQJ3/_new  2013-12-30 09:50:01.0 +0100
@@ -139,6 +139,13 @@
 
 make %{_smp_mflags} docdir=%{crmsh_docdir}
 
+%if 0%{?with_regression_tests}
+if ! test/unittests/testrunner.py ; then
+echo Shell unit tests failed.
+exit 1
+fi
+%endif
+
 %install
 make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
 install -Dm0644 contrib/bash_completion.sh 
%{buildroot}%{_sysconfdir}/bash_completion.d/crm.sh
@@ -149,20 +156,18 @@
 %clean
 rm -rf %{buildroot}
 
+# Run regression tests after installing the package
+# NB: this is called twice by OBS, that's why we touch the file
 %if 0%{?with_regression_tests}
-
 %post
-
-# NB: this is called twice by OBS, that's why we touch the file
 if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
 touch /tmp/.crmsh_regression_tests_ran
-if ! /usr/share/crmsh/tests/regression.sh ; then
+if ! %{_datadir}/%{name}/tests/regression.sh ; then
 echo Shell tests failed.
 cat crmtestout/regression.out
 exit 1
 fi
 fi
-
 %endif
 
 %files

++ crmsh-cibadmin_can_patch.patch ++
--- /var/tmp/diff_new_pack.uGQQJ3/_old  2013-12-30 09:50:01.0 +0100
+++ /var/tmp/diff_new_pack.uGQQJ3/_new  2013-12-30 09:50:01.0 +0100
@@ -1,12 +1,23 @@
-diff -r 13a63558be20 modules/utils.py
 a/modules/utils.py Fri Oct 25 16:57:25 2013 +0200
-+++ b/modules/utils.py Fri Oct 25 17:14:45 2013 +0200
-@@ -1008,7 +1008,7 @@ def is_pcmk_118(cib_f=None):
+commit 043a73a179116619bff65c46e3f6ac693dd57d3f
+Author: Kristoffer Grönlund k...@koru.se
+Date:   Thu Dec 12 15:06:21 2013 +0100
+
+Medium: utils: Enable CIB patches for 1.1.10
+
+Enable CIB patches on patched 1.1.10 systems.
+
+diff --git a/modules/utils.py b/modules/utils.py
+index 624fcbf0d841..45277fb10003 100644
+--- a/modules/utils.py
 b/modules/utils.py
+@@ -1097,8 +1097,8 @@ def cibadmin_features():
+ 
  
  def cibadmin_can_patch():
- # cibadmin -P doesn't handle comments, hopefully in v1.1.11
--return False
-+return True
- #return is_min_pcmk_ver(1.1.11)
+-# cibadmin -P doesn't handle comments in 1.1.11 (unless patched)
+-return is_min_pcmk_ver(1.1.11)
++# cibadmin -P doesn't handle comments in 1.1.10 (unless patched)
++return is_min_pcmk_ver(1.1.10)
  
  
+ # quote function from python module shlex.py in python 3.3

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2013-12-09 21:14:30.0 +0100
+++ new/crmsh/.hg_archival.txt  2013-12-20 11:02:10.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 1a0e32427c4270d7be8cdf7300fae13fe5d581c2
+node: 809d4b774bd4d6d41fdb0f2720286153fc5db977
 branch: default
 latesttag: 1.2.6-rc1
-latesttagdistance: 261
+latesttagdistance: 272
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/TODO new/crmsh/TODO
--- old/crmsh/TODO  2013-12-09 21:14:30.0 +0100
+++ new/crmsh/TODO  2013-12-20 11:02:10.0 +0100
@@ -18,10 +18,17 @@
 
- this feature needs very careful consideration
 
-Misc
+. CIB features
 
-. Create a web page
+- Rules in primitive attribute declarations
 
-   - there's already space at crmsh.nongnu.org
+

commit crmsh for openSUSE:Factory

2013-12-10 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-12-10 17:42:08

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  2013-12-06 
11:45:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-12-10 
17:42:09.0 +0100
@@ -1,0 +2,10 @@
+Mon Dec  9 20:49:27 UTC 2013 - kgronl...@suse.com
+
+- medium: parse: rsc_template is not recognized by parser (bnc#854562)
+- medium: vars: Add support for remote-node (bnc#854552)
+- low: cibconfig: add missing config import
+- build: Add userprefs.py to Makefile
+- build: Add missing dependency for python-PyYAML (bnc#854060)
+- hb_report: Add support for xz compression (bnc#854060)
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.l2VdOG/_old  2013-12-10 17:42:10.0 +0100
+++ /var/tmp/diff_new_pack.l2VdOG/_new  2013-12-10 17:42:10.0 +0100
@@ -53,9 +53,11 @@
 Requires(pre):  pacemaker
 Requires:   pssh
 Requires:   python = 2.4
+Requires:   python-PyYAML
 Requires:   python-dateutil
 Requires:   python-lxml
 Requires:   which
+BuildRequires:  python-PyYAML
 BuildRequires:  python-lxml
 
 %if 0%{?suse_version}

++ crmsh.tar.bz2 ++
 1690 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2013-12-06 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-12-06 11:45:06

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  2013-11-07 
08:38:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-12-06 
11:45:07.0 +0100
@@ -1,0 +2,24 @@
+Thu Dec  5 10:39:01 UTC 2013 - kgronl...@suse.com
+
+- build: update version number to 2.0
+- ui: minor completion bug fixes
+- doc: document 'options show all'
+- cluster: Added prototypical cluster sublevel
+- upstream cs: 258f36978113
+
+---
+Tue Dec  3 17:52:48 UTC 2013 - kgronl...@suse.com
+
+- ui: Added bash completion
+- ui: Improved interactive completion (bnc#845337)
+- ui: Better help output
+- ui: Colors for prompt and interactive help
+- ui: Tab completion for multi-line statements (bnc#845339)
+- config: New configuration file format
+- ui: New command: resource scores
+- configure: Allow setting role in location constraints
+- templates: Updated OCFS2 template
+- cluster: WIP cluster configuration sublevel
+- upstream cs: b63a22f6252b
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.FcI9L0/_old  2013-12-06 11:45:07.0 +0100
+++ /var/tmp/diff_new_pack.FcI9L0/_new  2013-12-06 11:45:07.0 +0100
@@ -41,7 +41,7 @@
 Summary:Pacemaker command line interface
 License:GPL-2.0+
 Group:  %{pkg_group}
-Version:1.2.6
+Version:2.0
 Release:%{?crmsh_release}%{?dist}
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2
@@ -74,7 +74,6 @@
 BuildRequires:  asciidoc
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python
 
@@ -123,13 +122,15 @@
 %if 0%{?suse_version}  1020
 export docdir=%{crmsh_docdir}
 %{configure}   \
+--sysconfdir=%{_sysconfdir} \
--localstatedir=%{_var} \
-   --with-package-name=%{name} \
+--with-pkg-name=%{name} \
--with-version=%{version}-%{release}
 %else
 %{configure}   \
+--sysconfdir=%{_sysconfdir} \
--localstatedir=%{_var} \
-   --with-package-name=%{name} \
+--with-pkg-name=%{name} \
--with-version=%{version}-%{release}\
--docdir=%{crmsh_docdir}
 %endif
@@ -137,8 +138,8 @@
 make %{_smp_mflags} docdir=%{crmsh_docdir}
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
+install -Dm0644 contrib/bash_completion.sh 
%{buildroot}%{_sysconfdir}/bash_completion.d/crm.sh
 %if 0%{?suse_version}
 %fdupes %{buildroot}
 %endif
@@ -149,6 +150,7 @@
 %if 0%{?with_regression_tests}
 
 %post
+
 # NB: this is called twice by OBS, that's why we touch the file
 if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
touch /tmp/.crmsh_regression_tests_ran
@@ -158,16 +160,17 @@
exit 1
fi
 fi
+
 %endif
 
 %files
 ###
 %defattr(-,root,root)
 
-%{_datadir}/%{name}
-
 %{_sbindir}/crm
-%{py_sitedir}/%{name}
+%{py_sitedir}/crmsh
+
+%{_datadir}/%{name}
 
 %doc %{_mandir}/man8/*
 %{crmsh_docdir}/COPYING
@@ -177,8 +180,12 @@
 %{crmsh_docdir}/README
 %{crmsh_docdir}/contrib/*
 
+%{_sysconfdir}/crm
+%config %{_sysconfdir}/crm/crm.conf
+
 %dir %{crmsh_docdir}
 %dir %{crmsh_docdir}/contrib
 %dir %attr (770, %{uname}, %{gname}) %{_var}/cache/crm
+%config %{_sysconfdir}/bash_completion.d/crm.sh
 
 %changelog

++ crmsh.tar.bz2 ++
 20717 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2013-11-06 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-11-07 08:37:59

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  2013-10-17 
14:01:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-11-07 
08:38:00.0 +0100
@@ -1,0 +2,15 @@
+Mon Oct 28 15:57:05 UTC 2013 - dmuhameda...@suse.com
+
+- build: add dependency on which
+- upstream cs: eff5a29dc60e
+
+---
+Fri Oct 25 16:10:35 UTC 2013 - dmuhameda...@suse.com
+
+- build: add hb_report from cluster-glue
+- ui: anonymous temporary shadow CIBs
+- ra: improve error reporting if the RA does not exist
+- history: add wdiff command
+- upstream cs: da117d6c690d
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.tkZw3C/_old  2013-11-07 08:38:02.0 +0100
+++ /var/tmp/diff_new_pack.tkZw3C/_new  2013-11-07 08:38:02.0 +0100
@@ -55,6 +55,7 @@
 Requires:   python = 2.4
 Requires:   python-dateutil
 Requires:   python-lxml
+Requires:   which
 BuildRequires:  python-lxml
 
 %if 0%{?suse_version}
@@ -163,12 +164,12 @@
 ###
 %defattr(-,root,root)
 
-%{_datadir}/crmsh
+%{_datadir}/%{name}
 
 %{_sbindir}/crm
-%{py_sitedir}/crmsh
+%{py_sitedir}/%{name}
 
-%doc %{_mandir}/man8/crm.8*
+%doc %{_mandir}/man8/*
 %{crmsh_docdir}/COPYING
 %{crmsh_docdir}/AUTHORS
 %{crmsh_docdir}/crm.8.html

++ crmsh-cibadmin_can_patch.patch ++
--- /var/tmp/diff_new_pack.tkZw3C/_old  2013-11-07 08:38:02.0 +0100
+++ /var/tmp/diff_new_pack.tkZw3C/_new  2013-11-07 08:38:02.0 +0100
@@ -1,18 +1,12 @@
-# HG changeset patch
-# Parent edde9365afa66becafaea3b48d29d6c9a8268005
-High: cibconfig: enable cibadmin patch functionality
-
-diff -r edde9365afa6 -r 4155dbe91ca1 modules/utils.py
 a/modules/utils.py Thu Sep 12 15:20:35 2013 +0200
-+++ b/modules/utils.py Fri Sep 13 15:04:02 2013 +0200
-@@ -1005,9 +1005,7 @@ def is_pcmk_118(cib_f=None):
- 
+diff -r 13a63558be20 modules/utils.py
+--- a/modules/utils.py Fri Oct 25 16:57:25 2013 +0200
 b/modules/utils.py Fri Oct 25 17:14:45 2013 +0200
+@@ -1008,7 +1008,7 @@ def is_pcmk_118(cib_f=None):
  
  def cibadmin_can_patch():
--# cibadmin -P doesn't handle comments, hopefully in v1.1.11
+ # cibadmin -P doesn't handle comments, hopefully in v1.1.11
 -return False
--#return is_min_pcmk_ver(1.1.11)
 +return True
+ #return is_min_pcmk_ver(1.1.11)
  
  
- user_prefs = UserPrefs.getInstance()

++ crmsh.tar.bz2 ++
 9338 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2013-10-17 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-10-17 14:01:25

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  2013-09-27 
17:07:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-10-17 
14:01:27.0 +0200
@@ -1,0 +2,9 @@
+Wed Oct 16 11:50:58 UTC 2013 - dmuhameda...@suse.com
+
+- doc: explain groups in more detail (bnc#845336)
+- cibconf: fix two fencing top issues (savannah#40173)
+- node: clear state new way since pcmk 1.1.8 (bnc#843699)
+- cibconf: improve message when producing a configuration graph
+- upstream cs: 6ebf75d0560b (1.2.6)
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2013-09-25 17:42:12.0 +0200
+++ new/crmsh/.hg_archival.txt  2013-10-16 12:48:23.0 +0200
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 6c2edea885b534c94b6b606e1c37ab3e62ca7854
+node: 4f66cc1901854a7cb60d483414ce5cf2d749db60
 branch: 1.2.6
 latesttag: crmsh-1.2.6
-latesttagdistance: 2
+latesttagdistance: 5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2013-09-25 17:42:12.0 +0200
+++ new/crmsh/doc/crm.8.txt 2013-10-16 12:48:23.0 +0200
@@ -1743,7 +1743,20 @@
 [[cmdhelp_configure_group,define a group]]
  `group`
 
-The `group` command creates a group of resources.
+The `group` command creates a group of resources. This can be useful
+when resources depend on other resources and require that those
+resources start in order on the same node. A commmon use of resource
+groups is to ensure that a server and a virtual IP are located
+together, and that the virtual IP is started before the server.
+
+Grouped resources are started in the order they appear in the group,
+and stopped in the reverse order. If a resource in the group cannot
+run anywhere, resources following it in the group will not start.
+
+`group` can be passed the container meta attribute, to indicate that
+it is to be used to group VM resources monitored using Nagios. The
+resource referred to by the container attribute must be of type
+`ocf:heartbeat:Xen`, `oxf:heartbeat:VirtualDomain` or `ocf:heartbeat:lxc`.
 
 Usage:
 ...
@@ -1757,6 +1770,8 @@
 ...
 group internal_www disk0 fs0 internal_ip apache \
   meta target_role=stopped
+
+group vm-and-services vm vm-sshd meta container=vm
 ...
 
 [[cmdhelp_configure_clone,define a clone]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2013-09-25 17:42:12.0 +0200
+++ new/crmsh/modules/cibconfig.py  2013-10-16 12:48:23.0 +0200
@@ -1927,7 +1927,8 @@
 d[target][c.get(index)] = c.get(devices)
 dd = odict()
 for target in d.keys():
-dd[target] = [d[target][x] for x in sorted(d[target].keys())]
+dd[target] = [d[target][str(x)] 
+for x in sorted([int(i) for i in d[target].keys()])]
 d2 = {}
 for target in dd.keys():
 devs_s = ' '.join(dd[target])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/ui.py new/crmsh/modules/ui.py
--- old/crmsh/modules/ui.py 2013-09-25 17:42:12.0 +0200
+++ new/crmsh/modules/ui.py 2013-10-16 12:48:23.0 +0200
@@ -1206,6 +1206,7 @@
 node_delete = cibadmin -D -o nodes -X 'node uname=\%s\/'
 node_delete_status = cibadmin -D -o status -X 'node_state 
uname=\%s\/'
 node_clear_state = cibadmin %s -o status --xml-text 'node_state 
id=\%s\ uname=\%s\ ha=\active\ in_ccm=\false\ crmd=\offline\ 
join=\member\ expected=\down\ crm-debug-origin=\manual_clear\ 
shutdown=\0\/'
+node_clear_state_118 = stonith_admin --confirm %s
 hb_delnode = config.DATADIR + /heartbeat/hb_delnode '%s'
 crm_node = crm_node
 node_fence = crm_attribute -t status -U '%s' -n terminate -v true
@@ -1354,8 +1355,11 @@
 if not user_prefs.force and \
 not utils.ask(Do you really want to drop state for node %s? 
% node):
 return False
-return utils.ext_cmd(self.node_clear_state % (-M 

commit crmsh for openSUSE:Factory

2013-09-27 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-09-27 17:07:38

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  2013-08-27 
20:39:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-09-27 
17:07:40.0 +0200
@@ -1,0 +2,43 @@
+Wed Sep 25 16:06:59 UTC 2013 - dmuhameda...@suse.com
+
+- cibconf: fix removing cluster properties in edit (bnc#841764)
+- history: improve setting history source
+- cibconf: fix rsc_template referencing (savannah#40011)
+- help: fix help for alias commands
+- history: show and allow completion of all primitives and not
+  only top level resources such as groups
+- site: add missing completions
+- site: add missing command aliases
+- upstream cs: crmsh-1.2.6
+
+---
+Mon Sep 23 18:11:39 UTC 2013 - kgronl...@suse.com
+
+- Use fdupes to make symlinks of duplicate .pyo files.
+
+---
+Fri Sep 13 13:06:13 UTC 2013 - dmuhameda...@suse.com
+
+- Add crmsh-cibadmin_can_patch.patch: Allow atomic CIB updates
+  (cibadmin -P support)
+
+---
+Fri Sep 13 09:05:10 UTC 2013 - dmuhameda...@suse.com
+
+- completion: list all resource ids for rsctest
+- rsctest: fix multistate resource testing
+- rsctest: add support for STONITH resources
+- history: use more anonymous groups to prevent out of groups
+  assertion
+- upstream cs: edde9365afa6
+
+---
+Wed Aug 28 14:52:09 UTC 2013 - dmuhameda...@suse.com
+
+- cibconf: disable atomic updates until cibadmin gets fixed
+- cibconf: match special ids on configuration edit (fixes
+  disappearing elements on edit)
+- doc: website sources
+- upstream cs: 5cfd0ebaa7e3 (1.2.6-rc3)
+
+---

New:

  crmsh-cibadmin_can_patch.patch



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.sUoZFB/_old  2013-09-27 17:07:41.0 +0200
+++ /var/tmp/diff_new_pack.sUoZFB/_new  2013-09-27 17:07:41.0 +0200
@@ -22,7 +22,7 @@
 
 %global upstream_version tip
 %global upstream_prefix crmsh
-%global crmsh_release 0.rc2
+%global crmsh_release 1
 
 %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 
0%{?rhel} || 0%{?fedora}
 %define pkg_group System Environment/Daemons
@@ -42,9 +42,13 @@
 License:GPL-2.0+
 Group:  %{pkg_group}
 Version:1.2.6
-Release:%{?crmsh_release}.CI_CNT.B_CNT
+Release:%{?crmsh_release}%{?dist}
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2
+# PATCH-FEATURE-OPENSUSE crmsh-cibadmin_can_patch.patch
+# de...@suse.de -- enable atomic CIB updates here, because our
+# pacemaker version has been fixed in the meantime
+Patch11:crmsh-cibadmin_can_patch.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires(pre): pacemaker
 Requires:   pssh
@@ -56,6 +60,7 @@
 %if 0%{?suse_version}
 # Suse splits this off into a separate package
 Requires:   python-curses
+BuildRequires:  fdupes
 BuildRequires:  libglue-devel
 BuildRequires:  libpacemaker-devel
 BuildRequires:  python-curses
@@ -98,6 +103,7 @@
 
 %prep
 %setup -q -n %{upstream_prefix}
+%patch11 -p1
 
 # Force the local time
 #
@@ -132,6 +138,9 @@
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
+%if 0%{?suse_version}
+%fdupes %{buildroot}
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -139,10 +148,14 @@
 %if 0%{?with_regression_tests}
 
 %post
-if ! /usr/share/crmsh/tests/regression.sh ; then
+# NB: this is called twice by OBS, that's why we touch the file
+if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
+   touch /tmp/.crmsh_regression_tests_ran
+   if ! /usr/share/crmsh/tests/regression.sh ; then
echo Shell tests failed.
cat crmtestout/regression.out
exit 1
+   fi
 fi
 %endif
 

++ crmsh-cibadmin_can_patch.patch ++
# HG changeset patch
# Parent edde9365afa66becafaea3b48d29d6c9a8268005
High: cibconfig: enable cibadmin patch functionality

diff -r edde9365afa6 -r 4155dbe91ca1 modules/utils.py
--- a/modules/utils.py  Thu Sep 12 15:20:35 2013 +0200
+++ b/modules/utils.py  Fri Sep 13 15:04:02 2013 +0200
@@ -1005,9 +1005,7 @@ def is_pcmk_118(cib_f=None):
 
 
 def cibadmin_can_patch():
-# cibadmin -P doesn't handle comments, hopefully in v1.1.11
-return False
-#return is_min_pcmk_ver(1.1.11)

commit crmsh for openSUSE:Factory

2013-08-27 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-08-27 20:39:54

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  2013-03-08 
09:09:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-08-27 
20:39:57.0 +0200
@@ -1,0 +2,55 @@
+Thu Aug  8 13:36:24 UTC 2013 - dmuhameda...@suse.com
+
+- cibconf: repair configure load update
+- upstream cs: 66376eb02944
+
+---
+Mon Aug  5 15:56:51 UTC 2013 - dmuhameda...@suse.com
+
+- release candidate 1.2.6-rc1
+- main: allow starting with a specified CIB shadow
+- main: make sure that tmp files get removed
+- cibconf: replace minidom with lxml
+- cibconf: groups can have the container meta attribute
+- cibconf: do not load CIB automatically in a non-interactive
+  mode (bnc#813045)
+- cibconf: allow single level fencing_topology (savannah#38737)
+- cibconf: improve exit code if a referenced element does not
+  exist (e.g. in the show command)
+- cibconf: add simulate alias for the ptest command
+- cibconf: add -S when running crm_simulate (formerly ptest)
+- cibconf: use cibadmin patch to update live CIB (with pcmk = 1.1.10)
+- cibconf: node ids are not id but text
+- cibconf: improve elements edit operation
+- resource: trace and untrace (RA) commands
+- resource: prevent whitespace in meta_attributes when setting
+  attributes in nested elements such as groups (bnc#815447)
+- resource: add option for better control of group management
+  (bnc#806901)
+- node/resource: improve lifetime processing
+- node: update interface to crm_node, its usage changed
+  (bnc#805278)
+- node: maintenance/ready commands
+- node: ignore case when looking up nodes
+- node: update interface to crm_node (node delete)
+- node: allow forced node removal
+- shadow: fix regression in cib import (from PE file)
+- shadow: set shadow directory according to the user preference
+- history: fix search for resource messages (bnc#803790)
+- history: refresh live report for commands other than info
+  (bnc#807402)
+- history: use anonymous re groups to prevent out of groups assertion
+- history: fix xpath expression for graphs of resource sets
+- history: skip empty lines (!) when searching logs
+- history: add support for rfc5242 date format in syslog
+- userprefs: add reset command
+- ui: fix exit code of crm status if crm_mon fails (savannah#38702)
+- ui: fix exit code of the help command
+- parse: drop obsolete test for operations
+- performance: do not make unnecessary parameter uniqueness test
+  (bnc#806372)
+- performance: check programs existence with python os module
+  (bnc#806372)
+- performance: improve tests for running resources
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.RbAlBP/_old  2013-08-27 20:39:58.0 +0200
+++ /var/tmp/diff_new_pack.RbAlBP/_new  2013-08-27 20:39:58.0 +0200
@@ -16,15 +16,19 @@
 #
 
 
-# crmsh requires pacemaker, which in turn requires cluster-glue, which has a
-# %pre script which creates the hacluster/haclient user and group used here:
 %global gname haclient
 %global uname hacluster
 %global crmsh_docdir %{_defaultdocdir}/%{name}
 
-%global specversion 0
 %global upstream_version tip
 %global upstream_prefix crmsh
+%global crmsh_release 0.rc2
+
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 
0%{?rhel} || 0%{?fedora}
+%define pkg_group System Environment/Daemons
+%else
+%define pkg_group Productivity/Clustering/HA
+%endif
 
 # Compatibility macros for distros (fedora) that don't provide Python macros 
by default
 # Do this instead of trying to conditionally include 
{_rpmconfigdir}/macros.python
@@ -33,53 +37,41 @@
 %{!?py_libdir:  %{expand: %%global py_libdir   
%%{expand:{py_prefix}/{_lib}/python{py_ver
 %{!?py_sitedir: %{expand: %%global py_sitedir  
%%{expand:{py_libdir}/site-packages}}}
 
-%global crmsh_release %{specversion}
-
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
-%define pkg_group System Environment/Daemons
-%else
-%define pkg_group Productivity/Clustering/HA
-%endif
-
 Name:   crmsh
 Summary:Pacemaker command line interface
-License:GPL-2.0
+License:GPL-2.0+
 Group:  %{pkg_group}
-Version:1.2.5
-Release:0
+Version:1.2.6
+Release:%{?crmsh_release}.CI_CNT.B_CNT
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2
 BuildRoot:  

commit crmsh for openSUSE:Factory

2013-03-08 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-03-08 09:08:27

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2013-01-07 
15:02:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-03-08 
09:09:22.0 +0100
@@ -1,0 +2,13 @@
+Tue Feb 12 12:16:24 UTC 2013 - dmuhameda...@suse.com
+
+- main: do not fail if the user's homedir is not defined
+- cibconfig: directed graph support
+- cibconfig: modgroup command
+- cibconfig: fix syntax error in ptest
+- history: create missing parts of the history cache directory
+- history: graph command
+- history: show pe commands
+- history: diff between PE inputs
+- upstream cs: 53d0f83c064e (release v1.2.5)
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.3MvZy0/_old  2013-03-08 09:09:23.0 +0100
+++ /var/tmp/diff_new_pack.3MvZy0/_new  2013-03-08 09:09:23.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package crmsh
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,7 +45,7 @@
 Summary:Pacemaker command line interface
 License:GPL-2.0
 Group:  %{pkg_group}
-Version:1.2.4
+Version:1.2.5
 Release:0
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
 2223 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2013-01-07 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-01-07 15:02:17

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-12-28 
14:56:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-01-07 
15:02:18.0 +0100
@@ -1,0 +2,8 @@
+Thu Dec 27 14:49:32 UTC 2012 - dmuhameda...@suse.com
+
+- history: update completion lists for transition
+- history: add one node log pattern
+- history: add date to the long peinputs listing
+- upstream cs: bf5c9a8b3e87 (v1.2.4 really)
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2012-12-19 13:36:50.0 +0100
+++ new/crmsh/.hg_archival.txt  2012-12-24 15:53:28.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 7c09f05419e6d3a5abfef3afdfe92053a83cec8e
+node: bf5c9a8b3e8739e01f6bbe72064b17c94288480b
 branch: default
-latesttag: crmsh-1.2.3
-latesttagdistance: 20
+latesttag: crmsh-1.2.4
+latesttagdistance: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hgtags new/crmsh/.hgtags
--- old/crmsh/.hgtags   2012-12-19 13:36:50.0 +0100
+++ new/crmsh/.hgtags   2012-12-24 15:53:28.0 +0100
@@ -21,3 +21,4 @@
 b6bb311c7bd36c05206f3a1cd98193ccf46d8da0 crmsh-1.2.1
 4ca0d2abf345d207a5fbdbc444d70d8b18b0cc6a crmsh-1.2.2
 fe29639e39eb95b2d806f0567e6e0b6cf1070e96 crmsh-1.2.3
+51379136d6928d8ef5c6f24eec330794a6d265a3 crmsh-1.2.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/completion.py 
new/crmsh/modules/completion.py
--- old/crmsh/modules/completion.py 2012-12-19 13:36:50.0 +0100
+++ new/crmsh/modules/completion.py 2012-12-24 15:53:28.0 +0100
@@ -180,7 +180,7 @@
 def report_pe_list_transition(idx,delimiter = False):
 if delimiter:
 return ' '
-return crm_report.peinputs_list() + [showdot]
+return crm_report.peinputs_list() + [log, showdot, save]
 def report_pe_list_peinputs(idx,delimiter = False):
 if delimiter:
 return ' '
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/log_patterns.py 
new/crmsh/modules/log_patterns.py
--- old/crmsh/modules/log_patterns.py   2012-12-19 13:36:50.0 +0100
+++ new/crmsh/modules/log_patterns.py   2012-12-24 15:53:28.0 +0100
@@ -52,6 +52,7 @@
stonithd.*Succeeded.*node %%:,
pcmk_peer_update.*(lost|memb): %% ,
crmd.*ccm_event.*(NEW|LOST):.* %% ,
+   Node return implies stonith of %% ,
),
( # detail 1
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/log_patterns_118.py 
new/crmsh/modules/log_patterns_118.py
--- old/crmsh/modules/log_patterns_118.py   2012-12-19 13:36:50.0 
+0100
+++ new/crmsh/modules/log_patterns_118.py   2012-12-24 15:53:28.0 
+0100
@@ -50,6 +50,7 @@
stonithd.*Succeeded.*node %%:,
pcmk_peer_update.*(lost|memb): %% ,
crmd.*ccm_event.*(NEW|LOST):.* %% ,
+   Node return implies stonith of %% ,
),
( # detail 1
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/report.py new/crmsh/modules/report.py
--- old/crmsh/modules/report.py 2012-12-19 13:36:50.0 +0100
+++ new/crmsh/modules/report.py 2012-12-24 15:53:28.0 +0100
@@ -1196,11 +1196,12 @@
 return False
 self.show_logs(log_l = l)
 pe_details_header = \
-Start  End   Filename  Client User   Origin
+Date   StartEnd   Filename  Client User   Origin
 pe_details_separator = \
-=  ===     ==    ==
+   ====     ==    ==
 def pe_detail_format(self, t_obj):
 l = [
+shortdate(t_obj.start_ts),
 shorttime(t_obj.start_ts),
 t_obj.end_ts and shorttime(t_obj.end_ts) or --:--:--,
 # the format string occurs 

commit crmsh for openSUSE:Factory

2012-12-19 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2012-12-19 10:49:45

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-10-18 
15:54:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2012-12-19 
10:50:40.0 +0100
@@ -1,0 +2,16 @@
+Tue Dec 11 17:22:00 UTC 2012 - dmuhameda...@suse.com
+
+- cibconfig: improve id management on element update
+- cibconfig: don't bail out if filter fails
+- ui: improve quotes insertion
+- history: optimize source refreshing
+- history: fix setting up the timeframe alias for limit
+- history: fix unpacking reports specified without directory
+- history: add log subcommand to transition
+- ra: add support for nagios plugins
+- ra: don't print duplicate RAs in the list command (bnc#793585)
+- utils: make sure that there's at least one column (savannah#37658)
+- build: pcmk.pc renamed to pacemaker.pc in pacemaker v1.1.8
+- upstream cs: fe29639e39eb (v1.2.3)
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.PvgYRl/_old  2012-12-19 10:50:42.0 +0100
+++ /var/tmp/diff_new_pack.PvgYRl/_new  2012-12-19 10:50:42.0 +0100
@@ -45,7 +45,7 @@
 Summary:Pacemaker command line interface
 License:GPL-2.0
 Group:  %{pkg_group}
-Version:1.2.1
+Version:1.2.3
 Release:0
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2012-10-15 20:13:49.0 +0200
+++ new/crmsh/.hg_archival.txt  2012-12-11 18:29:34.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: b6bb311c7bd36c05206f3a1cd98193ccf46d8da0
+node: 355467d3974841ba2f0400ffe6cb251d88185786
 branch: default
-latesttag: crmsh-1.2.0
-latesttagdistance: 25
+latesttag: crmsh-1.2.3
+latesttagdistance: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hgtags new/crmsh/.hgtags
--- old/crmsh/.hgtags   2012-10-15 20:13:49.0 +0200
+++ new/crmsh/.hgtags   2012-12-11 18:29:34.0 +0100
@@ -18,3 +18,6 @@
 f731b72e3c82226b22c133a27462a019055f39e7 SLE11-HAE-GMC
 fd6bd4648675c2be80c7bed2d8f8d3e5a5074c59 Pacemaker-1.0.5
 45886ac2c124ce49fc004dbc080974dc76dea605 crmsh-1.2.0
+b6bb311c7bd36c05206f3a1cd98193ccf46d8da0 crmsh-1.2.1
+4ca0d2abf345d207a5fbdbc444d70d8b18b0cc6a crmsh-1.2.2
+fe29639e39eb95b2d806f0567e6e0b6cf1070e96 crmsh-1.2.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/ChangeLog new/crmsh/ChangeLog
--- old/crmsh/ChangeLog 2012-10-15 20:13:49.0 +0200
+++ new/crmsh/ChangeLog 2012-12-11 18:29:34.0 +0100
@@ -1,3 +1,21 @@
+* Tue Dec 11 2012 Dejan Muhamedagic de...@suse.de and many others
+- stable release 1.2.3
+- ra: don't print duplicate RAs in the list command (bnc#793585)
+- history: optimize source refreshing
+
+* Thu Dec  6 2012 Dejan Muhamedagic de...@suse.de and many others
+- stable release 1.2.2
+- cibconfig: don't bail out if filter fails
+- cibconfig: improve id management on element update
+- ra: add support for nagios plugins
+- utils: make sure that there's at least one column (savannah#37658)
+- ui: improve quotes insertion (possible regression)
+- history: adjust log patterns for pacemaker v1.1.8
+- history: fix setting up the timeframe alias for limit
+- history: fix unpacking reports specified without directory
+- history: add log subcommand to transition
+- build: pcmk.pc renamed to pacemaker.pc in pacemaker v1.1.8
+
 * Mon Oct 15 2012 Dejan Muhamedagic de...@suse.de and many others
 - stable release 1.2.1
 - cibconfig: show error message on id in use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/configure.ac new/crmsh/configure.ac
--- old/crmsh/configure.ac  2012-10-15 20:13:49.0 +0200
+++ new/crmsh/configure.ac  2012-12-11 18:29:34.0 +0100
@@ -21,7 +21,7 @@
 dnl checks for library functions
 dnl checks for system services
 
-AC_INIT(crmsh, 1.2.1, linux-ha@linux...@lists.linux-ha.org)
+AC_INIT(crmsh, 1.2.3, linux...@lists.linux-ha.org)
 
 AC_ARG_WITH(version,
 [  --with-version=version   Override package version (if you're a packager 
needing to pretend) ],
@@ -197,6 +197,9 @@
 
 

commit crmsh for openSUSE:Factory

2012-10-18 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2012-10-18 15:54:34

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-10-07 
18:54:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2012-10-18 
15:54:35.0 +0200
@@ -1,0 +2,23 @@
+Mon Oct 15 18:36:52 UTC 2012 - dmuhameda...@suse.com
+
+- report: adjust patterns for 1.1.8
+- ra: manage without glue installed (savannah#37560)
+- cibconfig: show error message on id in use
+- ui: readd quotes for single-shot commands
+- upstream cs: b6bb311c7bd3 (crmsh-1.2.1)
+
+---
+Thu Oct 11 09:41:09 UTC 2012 - dmuhameda...@suse.com
+
+- cibconfig: repair edit for non-vi users
+- cibconfig: node type is optional now
+- ra: add support for crm_resource
+- ra: improve support for RH fencing-agents
+- utils: exit code of cibadmin -Q on no section changed in 1.1.8
+- history: add the exclude (log messages) command
+- report: remove keyword 'as' which is not compatible with python
+  2.4 (savannah#37534)
+- build: replace StrictVersion with LooseVersion (savannah#37537)
+- upstream cs: 1d38a7a06f04
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.XxiFwr/_old  2012-10-18 15:54:36.0 +0200
+++ /var/tmp/diff_new_pack.XxiFwr/_new  2012-10-18 15:54:36.0 +0200
@@ -45,7 +45,7 @@
 Summary:Pacemaker command line interface
 License:GPL-2.0
 Group:  %{pkg_group}
-Version:1.2.0
+Version:1.2.1
 Release:0
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2012-09-27 19:36:05.0 +0200
+++ new/crmsh/.hg_archival.txt  2012-10-15 20:13:49.0 +0200
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 0994b099c2dcf9bb5e85aa7aae3a9bed368942c7
+node: b6bb311c7bd36c05206f3a1cd98193ccf46d8da0
 branch: default
 latesttag: crmsh-1.2.0
-latesttagdistance: 4
+latesttagdistance: 25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/ChangeLog new/crmsh/ChangeLog
--- old/crmsh/ChangeLog 2012-09-27 19:36:05.0 +0200
+++ new/crmsh/ChangeLog 2012-10-15 20:13:49.0 +0200
@@ -1,3 +1,20 @@
+* Mon Oct 15 2012 Dejan Muhamedagic de...@suse.de and many others
+- stable release 1.2.1
+- cibconfig: show error message on id in use
+- cibconfig: repair edit for non-vi users
+- cibconfig: update schema separately (don't remove the status section)
+- cibconfig: node type is optional now
+- ui: readd quotes for single-shot commands
+- ra: manage without glue installed (savannah#37560)
+- ra: improve support for RH fencing-agents
+- ra: add support for crm_resource
+- history: remove keyword 'as' which is not compatible with python
+  2.4 (savannah#37534)
+- history: add the exclude (log messages) command
+- history: pacemaker 1.1.8 compatibility code
+- utils: exit code of cibadmin -Q on no section changed in 1.1.8
+- some more pacemaker 1.1.8 compatibility code
+
 * Tue Sep 18 2012 Dejan Muhamedagic de...@suse.de and many others
 - stable release 1.2.0
 - cibconfig: support the kind attribute in orders
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/configure.ac new/crmsh/configure.ac
--- old/crmsh/configure.ac  2012-09-27 19:36:05.0 +0200
+++ new/crmsh/configure.ac  2012-10-15 20:13:49.0 +0200
@@ -21,7 +21,7 @@
 dnl checks for library functions
 dnl checks for system services
 
-AC_INIT(crmsh, 1.2.0, linux-ha@linux...@lists.linux-ha.org)
+AC_INIT(crmsh, 1.2.1, linux-ha@linux...@lists.linux-ha.org)
 
 AC_ARG_WITH(version,
 [  --with-version=version   Override package version (if you're a packager 
needing to pretend) ],
@@ -190,11 +190,17 @@
 AC_DEFINE_UNQUOTED(CRM_DTD_DIRECTORY,$CRM_DTD_DIRECTORY, Where to keep CIB 
configuration files)
 AC_SUBST(CRM_DTD_DIRECTORY)
 
-dnl Eventually move out of the heartbeat dir tree and create compatability code
-dnl CRM_DAEMON_DIR=$libdir/pacemaker
-GLUE_DAEMON_DIR=`extract_header_define $GLUE_HEADER GLUE_DAEMON_DIR`
-AC_DEFINE_UNQUOTED(GLUE_DAEMON_DIR,$GLUE_DAEMON_DIR, Location for Pacemaker 
daemons)
-AC_SUBST(GLUE_DAEMON_DIR)

commit crmsh for openSUSE:Factory

2012-10-07 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2012-10-07 18:54:47

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-09-23 
17:31:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2012-10-07 
18:54:48.0 +0200
@@ -1,0 +2,9 @@
+Thu Sep 27 17:42:24 UTC 2012 - dmuhameda...@suse.com
+
+- ra: don't fail on unknown ${} term sequences (fixes oracle 
+  metadata)
+- cibconfig: update schema separately (don't remove the status
+  section)
+- upstream cs: 0994b099c2dc
+
+---



Other differences:
--
++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2012-09-18 17:40:54.0 +0200
+++ new/crmsh/.hg_archival.txt  2012-09-27 19:36:05.0 +0200
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: df0b30262868a52fc5f21177fdb3d4a02badb49d
+node: 0994b099c2dcf9bb5e85aa7aae3a9bed368942c7
 branch: default
 latesttag: crmsh-1.2.0
-latesttagdistance: 1
+latesttagdistance: 4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py 
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py  2012-09-18 17:40:54.0 +0200
+++ new/crmsh/modules/cibconfig.py  2012-09-27 19:36:05.0 +0200
@@ -1677,6 +1677,7 @@
 common_err(current configuration not valid with %s, cannot change 
schema % schema_st)
 return 4
 self.cib_attrs[validate-with] = schema_st
+self.new_schema = True
 return 0
 def is_elem_supported(self,obj_type):
 'Do we support this element?'
@@ -1723,13 +1724,6 @@
 self.cib_attrs[attr] = cib.getAttribute(attr)
 schema.init_schema(cib)
 return True
-def refresh_cib_attrs(self):
-doc,cib = read_cib(cibdump2doc)
-if not cib:
-return
-self.cib_attrs = {}
-for attr in cib.attributes.keys():
-self.cib_attrs[attr] = cib.getAttribute(attr)
 #
 # create a doc from the list of objects
 # (used by CibObjectSetRaw)
@@ -1822,31 +1816,29 @@
 self.reset()
 self.initialize()
 return self.all_committed
-def update_cib_attrs(self, cib, reread):
+def commit_schema(self):
 '''
-Set the validate-with, the schema might have changed.
-Increase the epoch.
-On reread (usually force) read the attributes from the
-current CIB.
-'''
-if reread:
-schema_st = self.get_schema()
-self.refresh_cib_attrs()
-self.cib_attrs[validate-with] = schema_st
-cib.setAttribute(validate-with, self.get_schema())
-self.cib_attrs[epoch] = str(int(self.cib_attrs[epoch])+1)
-cib.setAttribute(epoch, self.cib_attrs[epoch])
+Set the validate-with, if the schema changed.
+'''
+s = 'cib validate-with=%s/' % self.cib_attrs[validate-with]
+rc = pipe_string(%s -U % cib_piped, s)
+if rc != 0:
+update_err(cib,-U,s, rc)
+return False
+self.new_schema = False
+return True
 def commit_doc(self,force):
 try:
-cib = self.doc.getElementsByTagName(cib)[0]
+conf_node = self.doc.getElementsByTagName(configuration)[0]
 except:
-common_error(cannot find the cib node)
+common_error(cannot find the configuration node)
+return False
+if self.new_schema and not self.commit_schema():
 return False
-self.update_cib_attrs(cib, force)
 cibadmin_opts = force and -R --force or -R
-rc = pipe_string(%s %s % (cib_piped,cibadmin_opts), cib.toxml())
+rc = pipe_string(%s %s % (cib_piped,cibadmin_opts), 
conf_node.toxml())
 if rc != 0:
-update_err(cib,cibadmin_opts,cib.toprettyxml(), rc)
+update_err(cib,cibadmin_opts,conf_node.toprettyxml(), rc)
 return False
 return True
 def mk_shadow(self):
@@ -1944,6 +1936,7 @@
 self.remove_queue = [] # a list of cib objects to be removed
 self.id_refs = {} # dict of id-refs
 self.overwrite = False # update cib unconditionally
+self.new_schema = False # schema changed
 def reset(self):
 if not self.doc:
 return

commit crmsh for openSUSE:Factory

2012-09-23 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2012-09-23 17:31:39

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-09-15 
17:26:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2012-09-23 
17:31:41.0 +0200
@@ -1,0 +2,11 @@
+Tue Sep 18 15:47:25 UTC 2012 - dmuhameda...@suse.com
+
+- help: add topics to the help system
+- help: add '?' as alias for help
+- help: append slash to levels in overview help screen
+- help: page overview help screens
+- ui: add vim syntax highlighting support
+- utils: use crm_simulate if ptest is not available
+- upstream cs: df0b30262868 (release 1.2.0)
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Dni03f/_old  2012-09-23 17:31:43.0 +0200
+++ /var/tmp/diff_new_pack.Dni03f/_new  2012-09-23 17:31:43.0 +0200
@@ -35,16 +35,24 @@
 
 %global crmsh_release %{specversion}
 
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
+%define pkg_group System Environment/Daemons
+%else
+%define pkg_group Productivity/Clustering/HA
+%endif
+
 Name:   crmsh
 Summary:Pacemaker command line interface
 License:GPL-2.0
-Group:  Productivity/Clustering/HA
-Version:1.1.0
+Group:  %{pkg_group}
+Version:1.2.0
 Release:0
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version}
 Requires(pre): pacemaker-ticket-support = 2.0
+%endif
 Requires(pre): pacemaker = 1.1.6
 Requires:   pssh
 Requires:   python = 2.4
@@ -62,8 +70,13 @@
 BuildRequires:  asciidoc
 BuildRequires:  autoconf
 BuildRequires:  automake
+%if 0%{?suse_version}
 BuildRequires:  libglue-devel
 BuildRequires:  libpacemaker-devel
+%else
+BuildRequires:  cluster-glue-libs-devel
+BuildRequires:  pacemaker-libs-devel
+%endif
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python
@@ -121,6 +134,13 @@
 
 %install
 %make_install
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
+# docs magically end up in /usr/share/doc/crmsh-$version on Fedora etc.
+# so if we don't get rid of 'em here, they'll end up duplicated, which
+# by default causes an Installed (but unpackaged) file(s) found error
+# during build.
+rm -r %{buildroot}%{crmsh_docdir}
+%endif
 
 %if 0%{?with_regression_tests}
 %post
@@ -152,6 +172,7 @@
 %doc AUTHORS
 %doc ChangeLog
 %doc README
+%doc contrib
 
 %dir %attr (770, %{uname}, %{gname}) %{_var}/cache/crm
 

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2012-08-29 14:56:25.0 +0200
+++ new/crmsh/.hg_archival.txt  2012-09-18 17:40:54.0 +0200
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: a4f00b8fb5c8d8014285d4a499e847b89f9851b6
+node: df0b30262868a52fc5f21177fdb3d4a02badb49d
 branch: default
-latesttag: Pacemaker-1.1.5
-latesttagdistance: 160
+latesttag: crmsh-1.2.0
+latesttagdistance: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hgtags new/crmsh/.hgtags
--- old/crmsh/.hgtags   2012-08-29 14:56:25.0 +0200
+++ new/crmsh/.hgtags   2012-09-18 17:40:54.0 +0200
@@ -17,3 +17,4 @@
 f731b72e3c82226b22c133a27462a019055f39e7 Pacemaker-1.0.3
 f731b72e3c82226b22c133a27462a019055f39e7 SLE11-HAE-GMC
 fd6bd4648675c2be80c7bed2d8f8d3e5a5074c59 Pacemaker-1.0.5
+45886ac2c124ce49fc004dbc080974dc76dea605 crmsh-1.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/ChangeLog new/crmsh/ChangeLog
--- old/crmsh/ChangeLog 2012-08-29 14:56:25.0 +0200
+++ new/crmsh/ChangeLog 2012-09-18 17:40:54.0 +0200
@@ -1,3 +1,74 @@
+* Tue Sep 18 2012 Dejan Muhamedagic de...@suse.de and many others
+- stable release 1.2.0
+- cibconfig: support the kind attribute in orders
+- cibconfig: implement node-attribute in collocations
+- cibconfig: support require-all in resource sets
+- cibconfig: support for fencing-topology
+- cibconfig: new schema command
+- rsctest: resource testing
+- history: implement session saving
+- history: add alias (timeframe) for the limit command
+- xml: support for RNG schema
+- site: ticket standby and activate commands
+- site: update interface to crm_ticket
+- 

commit crmsh for openSUSE:Factory

2012-09-15 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2012-09-15 17:26:22

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-05-03 
10:54:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2012-09-15 
17:26:23.0 +0200
@@ -1,0 +2,69 @@
+Wed Aug 29 13:07:43 UTC 2012 - dmuhameda...@suse.com
+
+- ui: import readline only when needed (don't print .[?1034h)
+- cibconfig: support kind attribute in orders
+- cibconfig: implement node-attribute in collocations
+- cibconfig: drop attributes set to default on cib import
+- cibconfig: support require-all in resource sets
+- cibconfig: support setting attributes resource sets
+- cibconfig: support for fencing-topology
+- cibconfig: new schema command
+- upstream cs: a4f00b8fb5c8
+
+---
+Fri Jul 20 20:34:29 UTC 2012 - dmuhameda...@suse.com
+
+- history: implement session saving
+- history: add alias (timeframe) for the limit command
+- history: improve limiting the report time period
+- xml: retrieve data from schema (lf#2092)
+- xml: support for RNG schema
+- upstream cs: 2651d52fb3cd
+
+---
+Mon Jul  9 14:12:49 UTC 2012 - dmuhameda...@suse.com
+
+- ui: fix the node status command (lf#2175)
+- cibconf: display referenced attr set ids (lf#2304)
+- cibconf: don't verify parameters starting with '$'
+- cibconf: fix meta attributes verify for container elements (lf#2555)
+- cibconf: test for duplicate monitor intervals (lf#2586)
+- cibconf: don't skip monitor operations on verify
+- ui: don't accept non-ascii input (lf#2597)
+- upstream cs: a2b420ccab94
+
+---
+Mon Jul  2 09:57:46 UTC 2012 - dmuhameda...@suse.com
+
+- ra: don't require certain parameters for rhcs stonith resources
+- ticket: fix redirecting rsc references in tickets (bnc#763465)
+- ui: enable wait (option -w) for single-shot configure commands
+- upstream cs: 94167417eb8f
+
+---
+Fri Jun  8 17:17:33 UTC 2012 - dmuhameda...@suse.com
+
+- report: fine tune resource match patterns
+- utils: improve terminal output height calculation (pager)
+- upstream cs: d1dc149810d7
+
+---
+Wed Jun  6 16:53:49 UTC 2012 - dmuhameda...@suse.com
+
+- rsctest: fixes and support for clones
+- upstream cs: fb4d9bbaff30
+
+---
+Tue Jun  5 16:45:36 UTC 2012 - dmuhameda...@suse.com
+
+- rsctest: resource testing
+- upstream cs: 28450520a1f1
+
+---
+Fri May 25 15:50:15 UTC 2012 - dmuhameda...@suse.com
+
+- shadow: calculate shadow directory just like crm_shadow (bnc#759056)
+- history: update patterns for resources
+- upstream cs: 9569a7f283cb afba1bc67e98
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.FiNURC/_old  2012-09-15 17:26:24.0 +0200
+++ /var/tmp/diff_new_pack.FiNURC/_new  2012-09-15 17:26:24.0 +0200
@@ -36,7 +36,7 @@
 %global crmsh_release %{specversion}
 
 Name:   crmsh
-Summary:Pacemaker/CRM shell
+Summary:Pacemaker command line interface
 License:GPL-2.0
 Group:  Productivity/Clustering/HA
 Version:1.1.0

++ crmsh.tar.bz2 ++
 5860 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit crmsh for openSUSE:Factory

2012-05-03 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2012-05-03 10:54:50

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-02-16 
12:19:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2012-05-03 
10:54:51.0 +0200
@@ -1,0 +2,33 @@
+Mon Apr 23 10:59:48 UTC 2012 - tser...@suse.com
+
+- Add libxslt-tools to BuildRequires
+
+---
+Thu Mar 29 08:15:31 UTC 2012 - l...@novell.com
+
+- Change how appropriate version of pacemaker for ticket support is
+  required (bnc#752241)
+
+---
+Tue Mar 27 12:59:13 UTC 2012 - dmuhameda...@suse.com
+
+- drop dependency on python-xdg (lives in SDK repo)
+
+---
+Tue Mar 27 12:34:51 UTC 2012 - dmuhameda...@suse.com
+
+- add Requires pacemaker = 1.1.6-2 to the spec file
+
+---
+Mon Mar 26 15:52:23 UTC 2012 - dmuhameda...@suse.com
+
+- move user files to standard locations (XDG)
+- site: ticket standby and activate commands
+- cibstatus: ticket management
+- site: update interface to crm_ticket
+- cibconf: use uname instead of id when listing nodes (cl#5043)
+- ra: use only effective UID when choosing RA interface
+- ra: always use lrmadmin with glue 1.0.10 (cl#5036)
+- upstream cs: 9569a7f283cb
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.GOziAd/_old  2012-05-03 10:54:52.0 +0200
+++ /var/tmp/diff_new_pack.GOziAd/_new  2012-05-03 10:54:52.0 +0200
@@ -44,26 +44,35 @@
 Url:http://savannah.nongnu.org/projects/crmsh
 Source0:crmsh.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-Requires(pre): pacemaker
+Requires(pre): pacemaker-ticket-support = 2.0
+Requires(pre): pacemaker = 1.1.6
+Requires:   pssh
 Requires:   python = 2.4
-Requires:   pssh python-dateutil
+Requires:   python-dateutil
 
 %if 0%{?suse_version}
 # Suse splits this off into a separate package
-Requires:   python-curses python-xml
+Requires:   python-curses
+Requires:   python-xml
 BuildRequires:  python-curses
 BuildRequires:  python-xml
 %endif
 
 # Required for core functionality
+BuildRequires:  asciidoc
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  pkgconfig
-BuildRequires:  python
 BuildRequires:  libglue-devel
 BuildRequires:  libpacemaker-devel
-BuildRequires:  asciidoc
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  python
+%if 0%{?suse_version}  1210
+# xsltproc is necessary for manpage generation; this is split out into
+# libxslt-tools as of openSUSE 12.2.  Possibly strictly should be
+# required by asciidoc
+BuildRequires:  libxslt-tools
+%endif
 
 %if 0%{?with_regression_tests}
 BuildRequires:  corosync

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2012-02-03 12:13:57.0 +0100
+++ new/crmsh/.hg_archival.txt  2012-03-26 17:48:33.0 +0200
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: c06b8cf8fcf8d4345157048974313aaf48db1ef8
+node: 9569a7f283cba50c9ce5f862d5da8e70556f70d2
 branch: default
 latesttag: Pacemaker-1.1.5
-latesttagdistance: 96
+latesttagdistance: 104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/crmsh.spec new/crmsh/crmsh.spec
--- old/crmsh/crmsh.spec2012-02-03 12:13:57.0 +0100
+++ new/crmsh/crmsh.spec2012-03-26 17:48:33.0 +0200
@@ -26,7 +26,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:   on
 Requires(pre): pacemaker
-Requires:  python = 2.4
+Requires:  python = 2.4 python-xdg
 
 %if 0%{?suse_version}
 # Suse splits this off into a separate package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2012-02-03 12:13:57.0 +0100
+++ new/crmsh/doc/crm.8.txt 2012-03-26 17:48:33.0 +0200
@@ -1155,7 +1155,7 @@
 
 Usage:
 ...
-ticket {grant|revoke|show|time|delete} ticket
+ticket {grant|revoke|standby|activate|show|time|delete} ticket
 ...
 Example:
 

commit crmsh for openSUSE:Factory

2012-02-16 Thread h_root
Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2012-02-16 12:19:15

Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and  /work/SRC/openSUSE:Factory/.crmsh.new (New)


Package is crmsh, Maintainer is dmuhameda...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes  2012-01-12 
15:25:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2012-02-16 
12:19:23.0 +0100
@@ -1,0 +2,15 @@
+Tue Feb 14 03:05:48 UTC 2012 - tser...@suse.com
+
+- history: reset time period when setting source
+- doc: describe deficiency in the configure edit command (bnc#715698)
+- cibconf: repair resource parameter uniqueness test
+- completion: add command aliases to completion tables (cl#5013)
+- cibconf: repair ability to manage multiple rsc/op_defaults (bnc#737812)
+- history: add clone/ms resources to events (fixes the transition command)
+- utils: repair ptest usage (bnc#736212)
+- cibconf: repair xml edit
+- history: expand clones and ms in the resource command (bnc#729631)
+- build: add optional regression testing on rpm build
+- upstream cs: c06b8cf8fcf8
+
+---



Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ygtnVe/_old  2012-02-16 12:19:25.0 +0100
+++ /var/tmp/diff_new_pack.ygtnVe/_new  2012-02-16 12:19:25.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package crmsh
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,8 @@
 #
 
 
+# crmsh requires pacemaker, which in turn requires cluster-glue, which has a
+# %pre script which creates the hacluster/haclient user and group used here:
 %global gname haclient
 %global uname hacluster
 %global crmsh_docdir %{_defaultdocdir}/%{name}
@@ -35,11 +37,11 @@
 
 Name:   crmsh
 Summary:Pacemaker/CRM shell
+License:GPL-2.0
+Group:  Productivity/Clustering/HA
 Version:1.1.0
 Release:0
-License:GPL-2.0
 Url:http://savannah.nongnu.org/projects/crmsh
-Group:  Productivity/Clustering/HA
 Source0:crmsh.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires(pre): pacemaker
@@ -49,15 +51,27 @@
 %if 0%{?suse_version}
 # Suse splits this off into a separate package
 Requires:   python-curses python-xml
-BuildRequires:  python-curses python-xml
+BuildRequires:  python-curses
+BuildRequires:  python-xml
 %endif
 
 # Required for core functionality
-BuildRequires:  autoconf automake pkgconfig python
-BuildRequires:  libglue-devel libpacemaker-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  pkgconfig
+BuildRequires:  python
+BuildRequires:  libglue-devel
+BuildRequires:  libpacemaker-devel
 BuildRequires:  asciidoc
 BuildRequires:  libtool
 
+%if 0%{?with_regression_tests}
+BuildRequires:  corosync
+BuildRequires:  procps
+BuildRequires:  vim-base
+Requires:   pacemaker
+%endif
+
 %description
 CRM shell is a Pacemaker cluster resource manager command line
 interface. It supports Pacemaker configuration, management, and
@@ -99,6 +113,22 @@
 %install
 %make_install
 
+%if 0%{?with_regression_tests}
+%post
+# Needed so that the shell doesn't get stuck on escape
+# sequences
+# NB: this is called twice by OBS, that's why we touch the file
+if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
+   touch /tmp/.crmsh_regression_tests_ran
+   export TERM=dumb
+   if ! /usr/share/crmsh/tests/regression.sh ; then
+   echo Shell tests failed.
+   cat crmtestout/regression.out
+   exit 1
+   fi
+fi
+%endif
+
 %files
 ###
 %defattr(-,root,root)

++ crmsh.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt  2011-11-24 18:21:55.0 +0100
+++ new/crmsh/.hg_archival.txt  2012-02-03 12:13:57.0 +0100
@@ -1,5 +1,5 @@
 repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: cb8034d8d3da45143798cc25ab90cdecfc5e685a
+node: c06b8cf8fcf8d4345157048974313aaf48db1ef8
 branch: default
 latesttag: Pacemaker-1.1.5
-latesttagdistance: 73
+latesttagdistance: 96
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh/crmsh.spec new/crmsh/crmsh.spec
--- old/crmsh/crmsh.spec2011-11-24 

<    1   2