Hello community,
here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2015-11-06 00:04:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk2 (Old)
and /work/SRC/openSUSE:Factory/.hawk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2015-10-30 13:44:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2015-11-06 00:04:26.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Nov 04 06:52:41 UTC 2015 - kgronlund@suse.com
+
+- Update to version 1.0.1+git.1446573432.048f37e:
+ + Cib: Handle multiple nest levels in mini (bsc#953417)
+ + Location: Fix rule_elem typo (bsc#953419)
+ + Fix RecordNotFound error
+
+-------------------------------------------------------------------
Old:
----
hawk2-1.0.1+git.1446137442.d9c6c0e.tar.bz2
New:
----
hawk2-1.0.1+git.1446573432.048f37e.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk2.spec ++++++
--- /var/tmp/diff_new_pack.RMxjrf/_old 2015-11-06 00:04:27.000000000 +0100
+++ /var/tmp/diff_new_pack.RMxjrf/_new 2015-11-06 00:04:27.000000000 +0100
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 1.0.1+git.1446137442.d9c6c0e
+Version: 1.0.1+git.1446573432.048f37e
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.RMxjrf/_old 2015-11-06 00:04:27.000000000 +0100
+++ /var/tmp/diff_new_pack.RMxjrf/_new 2015-11-06 00:04:27.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
- <param name="changesrevision">d9c6c0e97fafeb9b9071ed2a10fd88652f7a8c93</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">048f37edd1560af1dbaa399333000e553059603c</param></service></servicedata>
\ No newline at end of file
++++++ hawk2-1.0.1+git.1446137442.d9c6c0e.tar.bz2 -> hawk2-1.0.1+git.1446573432.048f37e.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1446137442.d9c6c0e/AUTHORS new/hawk2-1.0.1+git.1446573432.048f37e/AUTHORS
--- old/hawk2-1.0.1+git.1446137442.d9c6c0e/AUTHORS 2015-10-30 10:38:16.000000000 +0100
+++ new/hawk2-1.0.1+git.1446573432.048f37e/AUTHORS 2015-11-04 07:52:32.000000000 +0100
@@ -1,4 +1,7 @@
-Kristoffer Gronlund
+Jan Sperling
+Kristoffer Grönlund
Manuele Carlini
Thomas Boerger
+Thomas Hutterer
Tim Serong
+Tobias D. Oestreicher
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/cib.rb new/hawk2-1.0.1+git.1446573432.048f37e/hawk/app/models/cib.rb
--- old/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/cib.rb 2015-10-30 10:38:16.000000000 +0100
+++ new/hawk2-1.0.1+git.1446573432.048f37e/hawk/app/models/cib.rb 2015-11-04 07:52:32.000000000 +0100
@@ -92,6 +92,23 @@
meta.status == :offline
end
+ def node_state_of_resource(rsc)
+ nodestate = {}
+ rsc[:instances].each do |_, attrs|
+ [:master, :slave, :started, :failed, :pending].each do |rstate|
+ if attrs[rstate]
+ attrs[rstate].each do |n|
+ nodestate[n[:node]] = rstate
+ end
+ end
+ end
+ end if rsc.key? :instances
+ rsc[:children].each do |child|
+ nodestate = nodestate.merge(node_state_of_resource(child))
+ end if rsc.key? :children
+ nodestate
+ end
+
def status(minimal = false)
{
meta: meta.to_h,
@@ -104,28 +121,7 @@
result[:tickets] = {}
resources.each do |rsc|
- key = rsc[:id]
- result[:resources][key] ||= {}
- rsc[:instances].each do |_, attrs|
- [:master, :slave, :started, :failed, :pending].each do |rstate|
- if attrs[rstate]
- attrs[rstate].each do |n|
- result[:resources][key][n[:node]] = rstate
- end
- end
- end
- end if rsc.key? :instances
- rsc[:children].each do |child|
- child[:instances].each do |_, attrs|
- [:master, :slave, :started, :failed, :pending].each do |rstate|
- if attrs[rstate]
- attrs[rstate].each do |n|
- result[:resources][key][n[:node]] = rstate
- end
- end
- end
- end if child.key? :instances
- end if rsc.key? :children
+ result[:resources][rsc[:id]] = node_state_of_resource(rsc)
end
current_nodes.each do |node|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/location.rb new/hawk2-1.0.1+git.1446573432.048f37e/hawk/app/models/location.rb
--- old/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/location.rb 2015-10-30 10:38:16.000000000 +0100
+++ new/hawk2-1.0.1+git.1446573432.048f37e/hawk/app/models/location.rb 2015-11-04 07:52:32.000000000 +0100
@@ -156,10 +156,10 @@
# Rule notation
xml.elements.each("rule") do |rule|
set = {
- id: rule_elem.attributes["id"],
- role: rule_elem.attributes["role"] || nil,
- score: rule_elem.attributes["score"] || rule_elem.attributes["score-attribute"] || nil,
- boolean_op: rule_elem.attributes["boolean-op"] || "and",
+ id: rule.attributes["id"],
+ role: rule.attributes["role"] || nil,
+ score: rule.attributes["score"] || rule.attributes["score-attribute"] || nil,
+ boolean_op: rule.attributes["boolean-op"] || "and",
expressions: []
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/record.rb new/hawk2-1.0.1+git.1446573432.048f37e/hawk/app/models/record.rb
--- old/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/record.rb 2015-10-30 10:38:16.000000000 +0100
+++ new/hawk2-1.0.1+git.1446573432.048f37e/hawk/app/models/record.rb 2015-11-04 07:52:32.000000000 +0100
@@ -36,7 +36,7 @@
obj
rescue SecurityError => e
raise Cib::PermissionDenied, e.message
- rescue RecordNotFound => e
+ rescue Cib::RecordNotFound => e
raise Cib::RecordNotFound, e.message
rescue RuntimeError => e
raise Cib::CibError, e.message
@@ -75,7 +75,7 @@
end
rescue SecurityError => e
raise Cib::PermissionDenied, e.message
- rescue RecordNotFound => e
+ rescue Cib::RecordNotFound => e
[]
rescue RuntimeError => e
raise Cib::CibError, e.message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1446137442.d9c6c0e/rpm/hawk.spec new/hawk2-1.0.1+git.1446573432.048f37e/rpm/hawk.spec
--- old/hawk2-1.0.1+git.1446137442.d9c6c0e/rpm/hawk.spec 2015-10-30 10:38:16.000000000 +0100
+++ new/hawk2-1.0.1+git.1446573432.048f37e/rpm/hawk.spec 2015-11-04 07:52:32.000000000 +0100
@@ -28,7 +28,7 @@
%define pkg_group System Environment/Daemons
%endif
-%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
+%if 0%{?suse_version} && !0%{?is_opensuse}
%define bundle_gems 1
%endif
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 1.0.0~alpha1+git.1442580882.11cc227
+Version: 1.0.1+git.1446137442.d9c6c0e
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -74,10 +74,10 @@
BuildRequires: rubygem(%{rb_default_ruby_abi}:builder) >= 3.2
BuildRequires: rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5
-BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2
BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext:3.1)
-BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2)
-BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2
+BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0
BuildRequires: rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2
BuildRequires: rubygem(%{rb_default_ruby_abi}:hashie) >= 3.4
BuildRequires: rubygem(%{rb_default_ruby_abi}:js-routes:1)
@@ -108,9 +108,9 @@
%else
# SLES bundles all this stuff at build time, other distros just
# use runtime dependencies.
-Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9)
-Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2)
-Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js)
+Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2
+Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2
+Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0
Requires: rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2
Requires: rubygem(%{rb_default_ruby_abi}:hashie) >= 3.4
Requires: rubygem(%{rb_default_ruby_abi}:js-routes:1)
@@ -142,8 +142,6 @@
A web-based GUI for managing and monitoring the Pacemaker
High-Availability cluster resource manager.
-Authors: Tim Serong
-
%prep
%setup