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.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-08-16 
15:38:05.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.C6dYcZ/_new  2014-08-16 15:38:06.000000000 +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.000000000 +0200
+++ new/crmsh/modules/cibconfig.py      2014-08-15 11:33:43.000000000 +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.000000000 +0200
+++ new/crmsh/modules/constants.py      2014-08-15 11:33:43.000000000 +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.excl        2014-08-05 15:42:44.000000000 
+0200
+++ new/crmsh/test/testcases/common.excl        2014-08-15 11:33:43.000000000 
+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

Reply via email to