Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2012-02-16 12:22:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2011-12-25 17:34:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2012-02-16 12:22:49.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Feb 3 10:26:24 UTC 2012 - [email protected] + +- Misc: hb_report: strip tar timestamp warnings from stderr (bnc#735672) +- Misc: Colocation model: Don't modify resource list when generating + shell command +- GUI: Primitive editor: Disable "use template" checkbox when editing + existing resources +- Upstream version cs:a5fdb745d8e9 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.5c7Jwp/_old 2012-02-16 12:22:50.000000000 +0100 +++ /var/tmp/diff_new_pack.5c7Jwp/_new 2012-02-16 12:22:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package hawk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define www_base /srv/www %define vendor_ruby vendor_ruby %define init_style suse @@ -77,6 +78,7 @@ %package templates Summary: Hawk Setup Wizard Templates +Group: Productivity/Clustering/HA %description templates Template files for Hawk's cluster setup wizard. ++++++ hawk-0.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.5.1/.hg_archival.txt new/hawk-0.5.1/.hg_archival.txt --- old/hawk-0.5.1/.hg_archival.txt 2011-12-02 17:02:25.000000000 +0100 +++ new/hawk-0.5.1/.hg_archival.txt 2012-02-03 10:27:24.000000000 +0100 @@ -1,5 +1,5 @@ repo: 53225c8fc9056b3c31743a53a67c6a0e19c4dfd2 -node: ca6df475621bfe9974601f8c03091867b0afc3e9 +node: a5fdb745d8e929e4c3de4b7cc97ace30f9253c3e branch: default latesttag: hawk-0.5.1 -latesttagdistance: 12 +latesttagdistance: 15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.5.1/hawk/app/controllers/colocations_controller.rb new/hawk-0.5.1/hawk/app/controllers/colocations_controller.rb --- old/hawk-0.5.1/hawk/app/controllers/colocations_controller.rb 2011-12-02 17:02:25.000000000 +0100 +++ new/hawk-0.5.1/hawk/app/controllers/colocations_controller.rb 2012-02-03 10:27:24.000000000 +0100 @@ -116,6 +116,8 @@ m << set set = {} else + # r[:action] here is deliberate - ui.constraint always + # uses the term action, even when referring to roles. set[:role] = r[:action] != "" ? r[:action] : nil set[:resources] ||= [] set[:resources] << { :id => r[:id] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.5.1/hawk/app/models/colocation.rb new/hawk-0.5.1/hawk/app/models/colocation.rb --- old/hawk-0.5.1/hawk/app/models/colocation.rb 2011-12-02 17:02:25.000000000 +0100 +++ new/hawk-0.5.1/hawk/app/models/colocation.rb 2012-02-03 10:27:24.000000000 +0100 @@ -176,13 +176,16 @@ # then iterate through them (unlike the Order model, where # this is unnecessary) - collapsed = [ @resources.first ] + # Have to clone out of @resources, else we've just got references + # to elements of @resources inside collapsed, which causes @resources + # to be modified, which we *really* don't want. + collapsed = [ @resources.first.clone ] @resources.last(@resources.length - 1).each do |set| if collapsed.last[:sequential] == set[:sequential] && collapsed.last[:role] == set[:role] collapsed.last[:resources] += set[:resources] else - collapsed << set + collapsed << set.clone end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.5.1/hawk/app/views/primitives/edit.html.erb new/hawk-0.5.1/hawk/app/views/primitives/edit.html.erb --- old/hawk-0.5.1/hawk/app/views/primitives/edit.html.erb 2011-12-02 17:02:25.000000000 +0100 +++ new/hawk-0.5.1/hawk/app/views/primitives/edit.html.erb 2012-02-03 10:27:24.000000000 +0100 @@ -7,6 +7,10 @@ $("#<%= id_prefix %>_r_class").attr("disabled", "disabled"); $("#<%= id_prefix %>_r_provider").attr("disabled", "disabled"); $("#<%= id_prefix %>_r_type").attr("disabled", "disabled"); +<% if Util.has_feature?(:rsc_template) && !is_template? %> + $("#<%= id_prefix %>_r_template").attr("disabled", "disabled"); + $("#<%= id_prefix %>_use_template").attr("disabled", "disabled"); +<% end %> }); </script> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.5.1/hawk/lib/hb_report.rb new/hawk-0.5.1/hawk/lib/hb_report.rb --- old/hawk-0.5.1/hawk/lib/hb_report.rb 2011-12-02 17:02:25.000000000 +0100 +++ new/hawk-0.5.1/hawk/lib/hb_report.rb 2012-02-03 10:27:24.000000000 +0100 @@ -86,7 +86,10 @@ # contents of errfile as array, with "INFO" lines stripped (e.g. for # displaying warnings after an otherwise successful run) def err_filtered - err_lines.select {|e| !e.match(/( INFO: |(cat|tail): write error)/) } + err_lines.select {|e| + !e.match(/( INFO: |(cat|tail): write error)/) && + !e.match(/^tar:.*time stamp/) + } end # Note: This assumes pidfile doesn't exist (will always blow away what's -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
