commit crmsh for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-08-12 15:15:14.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 12 07:16:35 UTC 2015 - kgronlund@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.000000000 +0200 +++ /var/tmp/diff_new_pack.GJJ6w8/_new 2015-08-12 15:15:15.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.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.000000000 +0200 +++ /var/tmp/diff_new_pack.GJJ6w8/_new 2015-08-12 15:15:15.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">5abada255a1d0597ea613973339030b49b4cf9e1</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">fbe773c2828cf9147fc779a2aab7aa131eac1cfe</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.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/crm.conf.in 2015-08-12 09:16:34.000000000 +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.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/config.py 2015-08-12 09:16:34.000000000 +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.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/report.py 2015-08-12 09:16:34.000000000 +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.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1439305144.fbe773c/modules/ui_report.py 2015-08-12 09:16:34.000000000 +0200 @@ -25,7 +25,8 @@ extcmd = report_tool() if not extcmd: context.fatal_error("No reporting tool found") - cmd = [extcmd] + list(args) + extraopts = str(config.core.report_tool_options).strip().split() + cmd = [extcmd] + extraopts + list(args) if options.regression_tests: print ".EXT", cmd return subprocess.call(cmd, shell=False, preexec_fn=lambda: signal(SIGPIPE, SIG_DFL))
participants (1)
-
root@hilbert.suse.de