Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2016-08-03 11:44: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 2016-06-14 23:06:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-08-03 11:44:59.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jul 30 22:40:45 UTC 2016 - [email protected] + +- Update to version 2.2.0+git.1469918297.1b801f6: + * high: hb_report: Skip lines without timestamps in log correctly (bsc#989810) + * high: hb_report: Don't collect logs from journalctl if -M is set (bsc#990025) + * high: parse: Use original _TARGET_RE + * low: Fix a setting example of the alert to become the error + * low: scripts: Fix use of non-relative import for ra + +------------------------------------------------------------------- Old: ---- crmsh-2.2.0+git.1464769043.9e4df55.tar.bz2 New: ---- crmsh-2.2.0+git.1469918297.1b801f6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.qd1PBD/_old 2016-08-03 11:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.qd1PBD/_new 2016-08-03 11:45:00.000000000 +0200 @@ -32,13 +32,13 @@ %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define version_unconverted 2.2.0+git.1464769043.9e4df55 +%define version_unconverted 2.2.0+git.1469918297.1b801f6 Name: crmsh Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0+git.1464769043.9e4df55 +Version: 2.2.0+git.1469918297.1b801f6 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.qd1PBD/_old 2016-08-03 11:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.qd1PBD/_new 2016-08-03 11:45:00.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">9e4df55617a3255398064d789af1b5180d0de736</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">1b801f6bca54aa91ca066a057e3b0003715995e7</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0+git.1464769043.9e4df55.tar.bz2 -> crmsh-2.2.0+git.1469918297.1b801f6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/parse.py new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/parse.py --- old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/parse.py 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/parse.py 2016-07-31 00:40:44.000000000 +0200 @@ -40,7 +40,7 @@ _RA_TYPE_RE = re.compile(r'[a-z0-9_:-]+$', re.IGNORECASE) _TAG_RE = re.compile(r"([a-zA-Z_][^\s:]*):?$") _ROLE2_RE = re.compile(r"role=(.+)$", re.IGNORECASE) -_TARGET_RE = re.compile(r'([\w=-]+):$') +_TARGET_RE = re.compile(r'([^:]+):$') _TARGET_ATTR_RE = re.compile(r'attr:([\w-]+)=([\w-]+)$', re.IGNORECASE) TERMINATORS = ('params', 'meta', 'utilization', 'operations', 'op', 'rule', 'attributes') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/scripts.py new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/scripts.py --- old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/scripts.py 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/scripts.py 2016-07-31 00:40:44.000000000 +0200 @@ -691,7 +691,7 @@ def _process_agent_include(script, include): - import ra + from . import ra agent = include['agent'] info = ra.get_ra(agent) meta = info.meta() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/doc/crm.8.adoc new/crmsh-2.2.0+git.1469918297.1b801f6/doc/crm.8.adoc --- old/crmsh-2.2.0+git.1464769043.9e4df55/doc/crm.8.adoc 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/doc/crm.8.adoc 2016-07-31 00:40:44.000000000 +0200 @@ -2688,8 +2688,8 @@ to /var/log/cluster-alerts.log alert alert-2 /srv/pacemaker/example_alert.sh \ - to { /var/log/cluster-alerts.log } \ - meta timeout=60s + meta timeout=60s \ + to { /var/log/cluster-alerts.log } ............... [[cmdhelp_configure_cib,CIB shadow management]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/doc/website-v1/crm.conf new/crmsh-2.2.0+git.1469918297.1b801f6/doc/website-v1/crm.conf --- old/crmsh-2.2.0+git.1464769043.9e4df55/doc/website-v1/crm.conf 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/doc/website-v1/crm.conf 2016-07-31 00:40:44.000000000 +0200 @@ -544,7 +544,7 @@ {title%}<title>crmsh - {doctitle=}</title> <link rel="stylesheet" href="/css/font-awesome.min.css"> <link rel="stylesheet" href="/css/crm.css" type="text/css"> -<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'> +<link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'> <link href="/atom.xml" type="application/atom+xml" rel="alternate" title="crmsh atom feed"> </head> <body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/doc/website-v1/man-2.0.adoc new/crmsh-2.2.0+git.1469918297.1b801f6/doc/website-v1/man-2.0.adoc --- old/crmsh-2.2.0+git.1464769043.9e4df55/doc/website-v1/man-2.0.adoc 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/doc/website-v1/man-2.0.adoc 2016-07-31 00:40:44.000000000 +0200 @@ -333,7 +333,7 @@ Configuration templates have been deprecated in favor of the more capable `cluster scripts`. To learn how to use cluster scripts, see the dedicated documentation on the `crmsh` website at -http://crmsh.github.io/, or in the <<cmdhelp_script,Script section>>. +https://crmsh.github.io/, or in the <<cmdhelp_script,Script section>>. **************************** Configuration templates are ready made configurations created by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/hb_report/hb_report.in new/crmsh-2.2.0+git.1469918297.1b801f6/hb_report/hb_report.in --- old/crmsh-2.2.0+git.1464769043.9e4df55/hb_report/hb_report.in 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/hb_report/hb_report.in 2016-07-31 00:40:44.000000000 +0200 @@ -304,14 +304,16 @@ return fi - if [ -f "$WORKDIR/$JOURNAL_F" ]; then - echo $WORKDIR/$JOURNAL_F - return - fi + if [ -n "$EXTRA_LOGS" ]; then + if [ -f "$WORKDIR/$JOURNAL_F" ]; then + echo $WORKDIR/$JOURNAL_F + return + fi - if [ -f "$PCMK_LOG" ]; then - echo $PCMK_LOG - return + if [ -f "$PCMK_LOG" ]; then + echo $PCMK_LOG + return + fi fi echo ${HA_DEBUGFILE:-$HA_LOGFILE} @@ -1050,8 +1052,8 @@ local outf outf=$WORKDIR/$HALOG_F - # collect journal from systemd - collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F + # collect journal from systemd unless -M was passed + [ -n "$EXTRA_LOGS" ] && collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F if [ "$HA_LOG" ]; then # log provided by the user? [ -f "$HA_LOG" ] || { # not present diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/hb_report/utillib.sh new/crmsh-2.2.0+git.1469918297.1b801f6/hb_report/utillib.sh --- old/crmsh-2.2.0+git.1464769043.9e4df55/hb_report/utillib.sh 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/hb_report/utillib.sh 2016-07-31 00:40:44.000000000 +0200 @@ -220,7 +220,7 @@ local tm=$2 local first=1 local last=`wc -l < $logf` - local tmid mid trycnt + local tmid mid trycnt prevmid while [ $first -le $last ]; do mid=$((($last+$first)/2)) trycnt=10 @@ -230,9 +230,16 @@ warning "cannot extract time: $logf:$mid; will try the next one" trycnt=$(($trycnt-1)) # shift the whole first-last segment - first=$(($first-1)) - last=$(($last-1)) - mid=$((($last+$first)/2)) + prevmid=$mid + while [ $prevmid -eq $mid ]; do + first=$(($first-1)) + [ $first -lt 1 ] && first=1 + last=$(($last-1)) + [ $last -lt $first ] && last=$first + prevmid=$mid + mid=$((($last+$first)/2)) + [ $first -eq $last ] && break + done done if [ -z "$tmid" ]; then warning "giving up on log..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/setup.py new/crmsh-2.2.0+git.1469918297.1b801f6/setup.py --- old/crmsh-2.2.0+git.1464769043.9e4df55/setup.py 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/setup.py 2016-07-31 00:40:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env python # Note that this script only installs the python modules, # the other parts of crmsh are installed by autotools -from distutils.core import setup +from setuptools import setup setup(name='crmsh', version='2.2.1', @@ -10,4 +10,7 @@ author_email='[email protected]', url='http://crmsh.github.io/', packages=['crmsh'], - scripts=['crm']) + install_requires=['parallax', 'lxml', 'PyYAML', 'python-dateutil'], + scripts=['crm'], + data_files=[('/usr/share/crmsh', ['doc/crm.8.adoc'])], + include_package_data = True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/test/testcases/commit.exp new/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/commit.exp --- old/crmsh-2.2.0+git.1464769043.9e4df55/test/testcases/commit.exp 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/commit.exp 2016-07-31 00:40:44.000000000 +0200 @@ -11,7 +11,7 @@ .EXT crmd metadata .EXT pengine metadata .EXT cib metadata -ERROR: 7: st: attribute yoyo-meta does not exist +WARNING: 7: st: unknown attribute 'yoyo-meta' .INP: node node1 attributes mem=16G .INP: primitive p1 ocf:heartbeat:Dummy op monitor interval=60m op monitor interval=120m OCF_CHECK_LEVEL=10 .INP: primitive p2 ocf:heartbeat:Dummy @@ -49,7 +49,7 @@ .INP: commit .INP: _test .INP: verify -ERROR: 35: st: attribute yoyo-meta does not exist +WARNING: 35: st: unknown attribute 'yoyo-meta' .INP: show node node1 \ attributes mem=16G diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/test/testcases/ra.exp new/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/ra.exp --- old/crmsh-2.2.0+git.1464769043.9e4df55/test/testcases/ra.exp 2016-06-01 10:22:40.000000000 +0200 +++ new/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/ra.exp 2016-07-31 00:40:44.000000000 +0200 @@ -35,6 +35,14 @@ Number of seconds to sleep during operations. This can be used to test how the cluster reacts to operation timeouts. +fail_start_on (string): Report bogus start failure on specified host + Start actions will return failure if running on the host specified here, but + the resource will start successfully anyway (future monitor calls will find it + running). This can be used to test on-fail=ignore. + +envfile (string): Environment dump file + If this is set, the environment will be dumped to this file for every call. + Operations' defaults (advisory minimum): start timeout=20
