Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-09-16 11:02: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 2016-09-07
11:45:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-09-16
11:02:07.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 15 07:26:16 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.3.1+git.1473924149.8abc212:
+ * high: history: Quote archive tarball name if it contains spaces
(bsc#998959)
+ * high: history: Prefer /var/log/messages over ha-log.txt (bsc#998891)
+
+-------------------------------------------------------------------
Old:
----
crmsh-2.3.1+git.1472802925.a4a4041.tar.bz2
New:
----
crmsh-2.3.1+git.1473924149.8abc212.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.Kr4E1F/_old 2016-09-16 11:02:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Kr4E1F/_new 2016-09-16 11:02:08.000000000 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0+
Group: %{pkg_group}
-Version: 2.3.1+git.1472802925.a4a4041
+Version: 2.3.1+git.1473924149.8abc212
Release: 0
Url: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Kr4E1F/_old 2016-09-16 11:02:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Kr4E1F/_new 2016-09-16 11:02:08.000000000 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">a4a404123703a355e9cf9c94cecd401c3266c0d5</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">8abc2127fd1acecdc40ae4e242c1c02eeead75eb</param></service></servicedata>
\ No newline at end of file
++++++ crmsh-2.3.1+git.1472802925.a4a4041.tar.bz2 ->
crmsh-2.3.1+git.1473924149.8abc212.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/history.py
new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/history.py
--- old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/history.py 2016-09-02
09:56:25.000000000 +0200
+++ new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/history.py 2016-09-15
09:26:16.000000000 +0200
@@ -18,7 +18,7 @@
from .msg import common_debug, common_warn, common_err, common_error,
common_info, warn_once
-_LOG_FILES = ("ha-log.txt", "ha-log", "cluster-log.txt", "messages",
"journal.log", "pacemaker.log")
+_LOG_FILES = ("messages", "ha-log.txt", "ha-log", "cluster-log.txt",
"journal.log", "pacemaker.log")
#
@@ -225,8 +225,8 @@
except Exception, msg:
common_err("%s: %s" % (tarball, msg))
return None
- common_debug("tar -x%s < %s" % (tar_unpack_option, bfname))
- rc = utils.pipe_cmd_nosudo("tar -x%s < %s" % (tar_unpack_option,
bfname))
+ common_debug("tar -x%s < %s" % (tar_unpack_option,
utils.quote(bfname)))
+ rc = utils.pipe_cmd_nosudo("tar -x%s < %s" % (tar_unpack_option,
utils.quote(bfname)))
if self.source == "live":
os.remove(bfname)
os.chdir(cwd)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/logparser.py
new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/logparser.py
--- old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/logparser.py 2016-09-02
09:56:25.000000000 +0200
+++ new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/logparser.py 2016-09-15
09:26:16.000000000 +0200
@@ -620,16 +620,20 @@
Load state from cache file
"""
fn = self._metafile()
- if os.path.isfile(fn) and time.time() - os.stat(fn).st_mtime <
_METADATA_CACHE_AGE:
- try:
- with open(fn, 'rb') as f:
- try:
- if not self.from_dict(json.load(f)):
- return False
- crmlog.common_debug("Transition metadata loaded from
%s" % (fn))
- return True
- except ValueError as e:
- crmlog.common_debug("Failed to load metadata: %s" %
(e))
- except IOError as e:
- return False
+ if os.path.isfile(fn):
+ meta_mtime = os.stat(fn).st_mtime
+ logf_mtime = max([os.stat(f).st_mtime for f in self.filenames if
os.path.isfile(f)])
+
+ if meta_mtime >= logf_mtime and time.time() - meta_mtime <
_METADATA_CACHE_AGE:
+ try:
+ with open(fn, 'rb') as f:
+ try:
+ if not self.from_dict(json.load(f)):
+ return False
+ crmlog.common_debug("Transition metadata loaded
from %s" % (fn))
+ return True
+ except ValueError as e:
+ crmlog.common_debug("Failed to load metadata: %s"
% (e))
+ except IOError as e:
+ return False
return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1472802925.a4a4041/doc/website-v1/news/2016-09-02-release-2_3_1.adoc
new/crmsh-2.3.1+git.1473924149.8abc212/doc/website-v1/news/2016-09-02-release-2_3_1.adoc
---
old/crmsh-2.3.1+git.1472802925.a4a4041/doc/website-v1/news/2016-09-02-release-2_3_1.adoc
1970-01-01 01:00:00.000000000 +0100
+++
new/crmsh-2.3.1+git.1473924149.8abc212/doc/website-v1/news/2016-09-02-release-2_3_1.adoc
2016-09-15 09:26:16.000000000 +0200
@@ -0,0 +1,33 @@
+Releasing crmsh version 2.3.1
+=============================
+:Author: Kristoffer Gronlund
+:Email: kgronl...@suse.com
+:Date: 2016-09-02 10:00
+
+Hello everyone!
+
+Today I am releasing crmsh version 2.3.1. The only change this time is
+to lower the Python version requirement from 2.7 to 2.6. This is so
+that crmsh remains compatible with centOS 6, where there is no
+standardized Python 2.7 version available. For users of other
+distributions where Python 2.7 is available, there are no other
+changes in this release and no need to upgrade.
+
+The source code can be downloaded from Github:
+
+* https://github.com/ClusterLabs/crmsh/releases/tag/2.3.1
+
+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/ClusterLabs/crmsh/archive/2.3.1.tar.gz
+* https://github.com/ClusterLabs/crmsh/archive/2.3.1.zip
+
+As usual, a huge thank you to all contributors and users of crmsh!
+
+Cheers,
+Kristoffer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1472802925.a4a4041/doc/website-v1/news/2016-09-05-release-2_2_2.adoc
new/crmsh-2.3.1+git.1473924149.8abc212/doc/website-v1/news/2016-09-05-release-2_2_2.adoc
---
old/crmsh-2.3.1+git.1472802925.a4a4041/doc/website-v1/news/2016-09-05-release-2_2_2.adoc
1970-01-01 01:00:00.000000000 +0100
+++
new/crmsh-2.3.1+git.1473924149.8abc212/doc/website-v1/news/2016-09-05-release-2_2_2.adoc
2016-09-15 09:26:16.000000000 +0200
@@ -0,0 +1,36 @@
+Releasing crmsh version 2.2.2
+=============================
+:Author: Kristoffer Gronlund
+:Email: kgronl...@suse.com
+:Date: 2016-09-05 19:00
+
+Hello everyone!
+
+Today I am releasing crmsh version 2.2.2. The biggest change in this
+release is the backport of the support for event-based alerts from the
+2.3 branch. The full list of changes follows below:
+
+- high: parse: Backport of event-driven alerts parser (#150)
+- high: hb_report: Don't collect logs from journalctl if -M is set (bsc#990025)
+- high: hb_report: Skip lines without timestamps in log correctly (bsc#989810)
+- high: constants: Add maintenance to set of known attributes (bsc#981659)
+- high: utils: Avoid deadlock if DC changes during idle wait (bsc#978480)
+- medium: scripts: no-quorum-policy=ignore is deprecated (bsc#981056)
+- medium: tmpfiles: Create temporary directory if non-existing (bsc#981583)
+- medium: xmlutil: reduce unknown attribute to warning (bsc#981659)
+- medium: ui_resource: Add force argument to resource cleanup (bsc#979420)
+- parse: Use original _TARGET_RE
+
+The source code can be downloaded from Github:
+
+* https://github.com/ClusterLabs/crmsh/releases/tag/2.2.2
+
+Archives of the tagged release:
+
+* https://github.com/ClusterLabs/crmsh/archive/2.2.2.tar.gz
+* https://github.com/ClusterLabs/crmsh/archive/2.2.2.zip
+
+As usual, a huge thank you to all contributors and users of crmsh!
+
+Cheers,
+Kristoffer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1472802925.a4a4041/doc/website-v1/news.adoc
new/crmsh-2.3.1+git.1473924149.8abc212/doc/website-v1/news.adoc
--- old/crmsh-2.3.1+git.1472802925.a4a4041/doc/website-v1/news.adoc
2016-09-02 09:56:25.000000000 +0200
+++ new/crmsh-2.3.1+git.1473924149.8abc212/doc/website-v1/news.adoc
2016-09-15 09:26:16.000000000 +0200
@@ -1,14 +1,16 @@
= News
-link:/news/2016-09-01-release-2_1_7[2016-09-01 09:00]
+link:/news/2016-09-05-release-2_2_2[2016-09-05 19:00]
:leveloffset: 1
-include::news/2016-09-01-release-2_1_7.adoc[]
+include::news/2016-09-05-release-2_2_2.adoc[]
:leveloffset: 0
''''
+* link:/news/2016-09-02-release-2_3_1[2016-09-02 10:00 Releasing crmsh version
2.3.1]
+* link:/news/2016-09-01-release-2_1_7[2016-09-01 09:00 Announcing crmsh stable
release 2.1.7]
* link:/news/2016-08-12-release-2_3_0[2016-08-12 10:30 Releasing crmsh version
2.3.0]
* link:/news/2016-04-28-release-2_2_1[2016-04-28 01:00 crmsh 2.2.1 and 2.1.6
are released]
* link:/news/2016-01-15-release-2_2_0[2016-01-15 15:00 crmsh 2.2.0 is released]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1472802925.a4a4041/hb_report/hb_report.in
new/crmsh-2.3.1+git.1473924149.8abc212/hb_report/hb_report.in
--- old/crmsh-2.3.1+git.1472802925.a4a4041/hb_report/hb_report.in
2016-09-02 09:56:25.000000000 +0200
+++ new/crmsh-2.3.1+git.1473924149.8abc212/hb_report/hb_report.in
2016-09-15 09:26:16.000000000 +0200
@@ -305,6 +305,13 @@
fi
if [ -n "$EXTRA_LOGS" ]; then
+ for l in $EXTRA_LOGS; do
+ if [ -f "$l" ] && [ "$l" != "$PCMK_LOG" ]; then
+ echo $l
+ return
+ fi
+ done
+
if [ -f "$WORKDIR/$JOURNAL_F" ]; then
echo $WORKDIR/$JOURNAL_F
return
