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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-10-02 09:23:51.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 30 15:21:36 UTC 2015 - kgronlund@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.000000000 +0200 +++ /var/tmp/diff_new_pack.JUC9MH/_new 2015-10-02 09:23:52.000000000 +0200 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0~rc3+git.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.000000000 +0200 +++ /var/tmp/diff_new_pack.JUC9MH/_new 2015-10-02 09:23:52.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">80a246fe1ae9fdf650c8806452bd4171160433d2</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">aa2abdad0c401d1cebf43e1a20da26b3de2992c5</param></service></servicedata> \ 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.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/config.py 2015-09-30 17:21:36.000000000 +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.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/log_patterns_118.py 2015-09-30 17:21:36.000000000 +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 @@ " %% .*pcmk_shutdown:.Shutdown.complete", " %% .*Configuration.validated..Starting.heartbeat", "pengine.*Scheduling Node %% for STONITH", - "pengine.*pe_fence_node: Node %% will be fenced", - "crmd.* tengine_stonith_callback: .* for %% failed", - "stonith-ng.*log_operation:.*host '%%'", - "te_fence_node: Exec.*on %% ", - "pe_fence_node: Node %% will be fenced", - "stonith-ng.*remote_op_timeout.*on %% for.*timed out", - "stonith-ng.*can_fence_host_with_device:.*can not fence %%:", + "pengine.*Node %% will be fenced", + "crmd.*for %% failed", + "stonith-ng.*host '%%'", + "Exec.*on %% ", + "Node %% will be fenced", + "stonith-ng.*on %% for.*timed out", + "stonith-ng.*can not fence %%:", "stonithd.*Succeeded.*node %%:", - "pcmk_peer_update.*(?:lost|memb): %% ", - "crmd.*ccm_event.*(?:NEW|LOST):.* %% ", + "(?:lost|memb): %% ", + "crmd.*(?:NEW|LOST):.* %% ", "Node return implies stonith of %% ", ), ( # detail 1 @@ -58,8 +58,8 @@ ), "quorum": ( ( # detail 0 - "crmd.*crm_update_quorum:.Updating.quorum.status", - "crmd.*ais.disp.*quorum.(?:lost|ac?quir)", + "crmd.*Updating.quorum.status", + "crmd.*quorum.(?:lost|ac?quir)", ), ( # detail 1 ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/report.py new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/report.py --- old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/report.py 2015-09-24 16:41:02.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/report.py 2015-09-30 17:21:36.000000000 +0200 @@ -15,7 +15,7 @@ from .xmlutil import file2cib_elem, get_rsc_children_ids, get_prim_children_ids, compressed_file_to_cib from .utils import file2str, shortdate, acquire_lock, append_file, ext_cmd, shorttime from .utils import page_string, release_lock, rmdir_r, parse_time, get_cib_attributes -from .utils import is_pcmk_118, pipe_cmd_nosudo, file_find_by_name +from .utils import is_pcmk_118, pipe_cmd_nosudo, file_find_by_name, get_stdout, quote _HAS_PARALLAX = False try: @@ -732,6 +732,9 @@ elif bfname.endswith(".tar.gz"): # hmm, must be ancient loc = tarball.replace(".tar.gz", "") tar_unpack_option = "z" + elif bfname.endswith(".tar.xz"): + loc = tarball.replace(".tar.xz", "") + tar_unpack_option = "J" else: self.error("this doesn't look like a report tarball") return None @@ -747,11 +750,9 @@ except OSError, msg: self.error(msg) return None - import tarfile try: - tf = tarfile.open(bfname) - tf_loc = tf.getmembers()[0].name - if tf_loc != loc: + rc, tf_loc = get_stdout("tar -t%s < %s | head -1" % (tar_unpack_option, quote(bfname))) + if os.path.abspath(tf_loc) != os.path.abspath(loc): common_debug("top directory in tarball: %s, doesn't match the tarball name: %s" % (tf_loc, loc)) loc = os.path.join(os.path.dirname(loc), tf_loc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/ui_resource.py new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/ui_resource.py --- old/crmsh-2.2.0~rc3+git.1443105613.80a246f/modules/ui_resource.py 2015-09-24 16:41:02.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1443544100.aa2abda/modules/ui_resource.py 2015-09-30 17:21:36.000000000 +0200 @@ -174,8 +174,8 @@ rsc_status = "crm_resource --locate -r '%s'" rsc_showxml = "crm_resource -q -r '%s'" rsc_setrole = "crm_resource --meta -r '%s' -p target-role -v '%s'" - rsc_migrate = "crm_resource --move -r '%s' %s" - rsc_unmigrate = "crm_resource --clear -r '%s'" + rsc_migrate = "crm_resource --quiet --move -r '%s' %s" + rsc_unmigrate = "crm_resource --quiet --clear -r '%s'" rsc_ban = "crm_resource --ban -r '%s' %s" rsc_cleanup = "crm_resource -C -r '%s' -H '%s'" rsc_cleanup_all = "crm_resource -C -r '%s'"