Hello community,
here is the log from the commit of package hawk2 for openSUSE:Factory checked
in at 2015-10-30 13:44:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-25
19:13:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2015-10-30
13:44:06.000000000 +0100
@@ -1,0 +2,20 @@
+Fri Oct 30 09:38:24 UTC 2015 - kgronl...@suse.com
+
+- Update to version 1.0.1+git.1446137442.d9c6c0e:
+ + Simulator: Fix ticket simulation (bsc#952489)
+
+-------------------------------------------------------------------
+Wed Oct 28 16:15:17 UTC 2015 - kgronl...@suse.com
+
+- Update to version 1.0.1+git.1446048276.98c4de1:
+ + Fix help text for clone / multi-state (bsc#952439)
+ + Dashboard: Fix ownership of dashboard config (bsc#952442)
+ + Dashboard: Fix bad error message
+
+-------------------------------------------------------------------
+Tue Oct 27 07:19:42 UTC 2015 - kgronl...@suse.com
+
+- Update to version 1.0.0~alpha1+git.1445930333.51d3703:
+ + Report: Enable uploading gzipped archives (bsc#952136)
+
+-------------------------------------------------------------------
Old:
----
hawk2-1.0.0~alpha1+git.1445537620.7637b7f.tar.bz2
New:
----
hawk2-1.0.1+git.1446137442.d9c6c0e.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk2.spec ++++++
--- /var/tmp/diff_new_pack.3wbnvc/_old 2015-10-30 13:44:07.000000000 +0100
+++ /var/tmp/diff_new_pack.3wbnvc/_new 2015-10-30 13:44:07.000000000 +0100
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 1.0.0~alpha1+git.1445537620.7637b7f
+Version: 1.0.1+git.1446137442.d9c6c0e
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
++++++ _service ++++++
--- /var/tmp/diff_new_pack.3wbnvc/_old 2015-10-30 13:44:07.000000000 +0100
+++ /var/tmp/diff_new_pack.3wbnvc/_new 2015-10-30 13:44:07.000000000 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">hawk2</param>
- <param name="versionformat">1.0.0~alpha1+git.%ct.%h</param>
+ <param name="versionformat">1.0.1+git.%ct.%h</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.3wbnvc/_old 2015-10-30 13:44:07.000000000 +0100
+++ /var/tmp/diff_new_pack.3wbnvc/_new 2015-10-30 13:44:07.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
- <param
name="changesrevision">7637b7ffbf6688f8778d574971bff88d96cb204b</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">d9c6c0e97fafeb9b9071ed2a10fd88652f7a8c93</param></service></servicedata>
\ No newline at end of file
++++++ hawk2-1.0.0~alpha1+git.1445537620.7637b7f.tar.bz2 ->
hawk2-1.0.1+git.1446137442.d9c6c0e.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/dashboard.js
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/dashboard.js
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/dashboard.js
2015-10-22 23:51:44.000000000 +0200
+++
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/dashboard.js
2015-10-30 10:38:16.000000000 +0100
@@ -37,7 +37,7 @@
return __('Permission denied');
},
err_failed_op: function(op, node, rc, reason) {
- return __('%{op} failed on _NODE_} (rc=_RC_,
reason=_REASON_)').replace('_OP_', op).replace('_NODE_', node).replace('_RC_',
rc).replace('_REASON_', reason);
+ return __('_OP_ failed on _NODE_} (rc=_RC_,
reason=_REASON_)').replace('_OP_', op).replace('_NODE_', node).replace('_RC_',
rc).replace('_REASON_', reason);
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/module/simulator.js
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/module/simulator.js
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/module/simulator.js
2015-10-22 23:51:44.000000000 +0200
+++
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/module/simulator.js
2015-10-30 10:38:16.000000000 +0100
@@ -186,7 +186,8 @@
});
self.find("#sim-addticket").click(function() {
- $("#modal .modal-content").html($("#inject-ticket").render());
+ var content = $("#modal .modal-content");
+ content.html($("#inject-ticket").render());
content.find("form").submit(function(event) {
var ticket = content.find("#ticket-inject-ticket").val();
var action = content.find("#ticket-inject-action").val();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/cluster.rb
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/cluster.rb
--- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/cluster.rb
2015-10-22 23:51:44.000000000 +0200
+++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/cluster.rb
2015-10-30 10:38:16.000000000 +0100
@@ -49,14 +49,21 @@
clusters = {}
end
clusters[@name] = self.to_hash
- Rails.logger.debug "Writing #{fname}..."
- File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) }
- Rails.logger.debug "chmod 0660 #{fname}..."
- File.chmod(0660, fname)
- Rails.logger.debug "Copy #{fname}..."
- out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname)
- Rails.logger.debug "Copy returned #{out} #{err} #{rc}"
- rc == 0 ? true : err
+ begin
+ Rails.logger.debug "Writing #{fname}..."
+ File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) }
+ Rails.logger.debug "chmod 0664 #{fname}..."
+ File.chmod(0660, fname)
+ Rails.logger.debug "Copy #{fname}..."
+ out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname)
+ if rc == 0
+ out, err, rc = Util.run_as("root", "crm", "cluster", "run", "chown
hacluster:haclient #{fname}")
+ end
+ Rails.logger.debug "Copy returned #{out} #{err} #{rc}"
+ rc == 0 ? true : err
+ rescue Exception => e
+ e.message
+ end
end
def update
@@ -78,8 +85,12 @@
fname = "#{Rails.root}/tmp/dashboard.js"
return [] unless File.exists?(fname)
clusters = []
- JSON.parse(File.read(fname)).each do |id, data|
- clusters << parse(data)
+ begin
+ JSON.parse(File.read(fname)).each do |id, data|
+ clusters << parse(data)
+ end
+ rescue Exception => e
+ Rails.logger.debug "Error: #{e}"
end
clusters
end
@@ -88,14 +99,21 @@
Rails.logger.debug "remove: Removing #{name}..."
fname = "#{Rails.root}/tmp/dashboard.js"
return true unless File.exist?(fname)
- clusters = JSON.parse(File.read(fname))
- clusters = clusters.delete_if { |key, _| key == name }
- Rails.logger.debug "remove: Writing #{fname}..."
- File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) }
- File.chmod(0660, fname)
- out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname)
- Rails.logger.debug "remove: Copy returned #{out} #{err} #{rc}"
- [out, err, rc]
+ begin
+ clusters = JSON.parse(File.read(fname))
+ clusters = clusters.delete_if { |key, _| key == name }
+ Rails.logger.debug "remove: Writing #{fname}..."
+ File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) }
+ File.chmod(0660, fname)
+ out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname)
+ if rc == 0
+ out, err, rc = Util.run_as("root", "crm", "cluster", "run", "chown
hacluster:haclient #{fname}")
+ end
+ Rails.logger.debug "remove: Copy returned #{out} #{err} #{rc}"
+ [out, err, rc]
+ rescue Exception => e
+ ["", e.message, 1]
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/report.rb
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/report.rb
--- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/report.rb
2015-10-22 23:51:44.000000000 +0200
+++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/report.rb
2015-10-30 10:38:16.000000000 +0100
@@ -34,7 +34,7 @@
elsif archive.extname == ".xz"
"application/x-xz"
elsif archive.extname == ".gz"
- "application/x-gz"
+ "application/gzip"
else
"application/x-compressed"
end
@@ -281,8 +281,11 @@
attribute :upload, ActionDispatch::Http::UploadedFile
validate do |record|
- unless ["application/x-bzip", "application/x-xz",
"application/x-gz"].include? record.upload.content_type
- errors.add(:upload, _("must have correct MIME type"))
+ unless ["application/gzip",
+ "application/x-bzip",
+ "application/x-xz",
+ "application/x-gz"].include? record.upload.content_type
+ errors.add(:upload, _("must have correct MIME type (was %s)") %
record.upload.content_type)
end
unless record.upload.original_filename =~ /\.tar\.(bz2|gz|xz)\z/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/_form.html.haml
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/_form.html.haml
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/_form.html.haml
2015-10-22 23:51:44.000000000 +0200
+++
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/_form.html.haml
2015-10-30 10:38:16.000000000 +0100
@@ -1,5 +1,5 @@
.panel.panel-default
- .panel-body
+ .panel-body{ data: { help_target: "#rightbar > .container-fluid >
#helpentries > .attrhelp" } }
= form_for [cib, clone], horizontal: true do |main_form|
= errors_for clone
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/edit.html.haml
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/edit.html.haml
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/edit.html.haml
2015-10-22 23:51:44.000000000 +0200
+++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/edit.html.haml
2015-10-30 10:38:16.000000000 +0100
@@ -15,11 +15,12 @@
.row.clone
= localized_help_for :resources, :clone
- - @clone.mapping.each do |key, values|
- - next unless values[:longdesc]
+ #helpentries
+ - @clone.mapping.each do |key, values|
+ - next unless values[:longdesc]
- .row{ class: key }
- %h2.margin-bottom
- = key
+ .row.attrhelp{ class: key }
+ %h2.margin-bottom
+ = key
- = simple_format values[:longdesc]
+ = simple_format values[:longdesc]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/new.html.haml
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/new.html.haml
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/new.html.haml
2015-10-22 23:51:44.000000000 +0200
+++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/new.html.haml
2015-10-30 10:38:16.000000000 +0100
@@ -14,11 +14,12 @@
.row.clone
= localized_help_for :resources, :clone
- - @clone.mapping.each do |key, values|
- - next unless values[:longdesc]
+ #helpentries
+ - @clone.mapping.each do |key, values|
+ - next unless values[:longdesc]
- .row{ class: key }
- %h2.margin-bottom
- = key
+ .row.attrhelp{ class: key }
+ %h2.margin-bottom
+ = key
- = simple_format values[:longdesc]
+ = simple_format values[:longdesc]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/_form.html.haml
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/_form.html.haml
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/_form.html.haml
2015-10-22 23:51:44.000000000 +0200
+++
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/_form.html.haml
2015-10-30 10:38:16.000000000 +0100
@@ -1,5 +1,5 @@
.panel.panel-default
- .panel-body
+ .panel-body{ data: { help_target: "#rightbar > .container-fluid >
#helpentries > .attrhelp" } }
= form_for [cib, master], horizontal: true do |main_form|
= errors_for master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/edit.html.haml
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/edit.html.haml
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/edit.html.haml
2015-10-22 23:51:44.000000000 +0200
+++
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/edit.html.haml
2015-10-30 10:38:16.000000000 +0100
@@ -15,11 +15,12 @@
.row.master
= localized_help_for :resources, :master
- - @master.mapping.each do |key, values|
- - next unless values[:longdesc]
+ #helpentries
+ - @master.mapping.each do |key, values|
+ - next unless values[:longdesc]
- .row{ class: key }
- %h2.margin-bottom
- = key
+ .row.attrhelp{ class: key }
+ %h2.margin-bottom
+ = key
- = simple_format values[:longdesc]
+ = simple_format values[:longdesc]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/new.html.haml
new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/new.html.haml
---
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/new.html.haml
2015-10-22 23:51:44.000000000 +0200
+++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/new.html.haml
2015-10-30 10:38:16.000000000 +0100
@@ -14,11 +14,12 @@
.row.master
= localized_help_for :resources, :master
- - @master.mapping.each do |key, values|
- - next unless values[:longdesc]
+ #helpentries
+ - @master.mapping.each do |key, values|
+ - next unless values[:longdesc]
- .row{ class: key }
- %h2.margin-bottom
- = key
+ .row.attrhelp{ class: key }
+ %h2.margin-bottom
+ = key
- = simple_format values[:longdesc]
+ = simple_format values[:longdesc]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/tools/hawk_invoke.c
new/hawk2-1.0.1+git.1446137442.d9c6c0e/tools/hawk_invoke.c
--- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/tools/hawk_invoke.c
2015-10-22 23:51:44.000000000 +0200
+++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/tools/hawk_invoke.c 2015-10-30
10:38:16.000000000 +0100
@@ -108,6 +108,13 @@
strcmp(argv[4], "copy") == 0 &&
strendswith(argv[5], "/tmp/dashboard.js"))
return 1;
+ if (argc == 6 &&
+ strcmp(argv[2], "crm") == 0 &&
+ strcmp(argv[3], "cluster") == 0 &&
+ strcmp(argv[4], "run") == 0 &&
+ strendswith(argv[5], "/tmp/dashboard.js") &&
+ strncmp(argv[5], "chown hacluster:haclient", 24) == 0)
+ return 1;
return 0;
}
