Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2013-12-30 09:58:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2013-12-08 19:27:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2013-12-30 09:58:51.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 19 13:10:51 UTC 2013 - [email protected] + +- GUI: explorer: Warn if transition from different Pacemaker version + (fate#314392) +- GUI: explorer: Show diff link on every line +- Upstream version cs:5cd8197 + +------------------------------------------------------------------- Old: ---- hawk-0.6.2+git.1386336132.d28c6e8.tar.bz2 New: ---- hawk-0.6.2+git.1387458085.5cd8197.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.5neBbG/_old 2013-12-30 09:58:52.000000000 +0100 +++ /var/tmp/diff_new_pack.5neBbG/_new 2013-12-30 09:58:52.000000000 +0100 @@ -41,7 +41,7 @@ Summary: HA Web Konsole License: GPL-2.0 Group: %{pkg_group} -Version: 0.6.2+git.1386336132.d28c6e8 +Version: 0.6.2+git.1387458085.5cd8197 Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5neBbG/_old 2013-12-30 09:58:52.000000000 +0100 +++ /var/tmp/diff_new_pack.5neBbG/_new 2013-12-30 09:58:52.000000000 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">0.6.2+git.%ct.%h</param> - <param name="revision">master</param> + <param name="revision">5cd8197</param> </service> <service name="recompress" mode="disabled"> ++++++ hawk-0.6.2+git.1386336132.d28c6e8.tar.bz2 -> hawk-0.6.2+git.1387458085.5cd8197.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/Gemfile new/hawk-0.6.2+git.1387458085.5cd8197/hawk/Gemfile --- old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/Gemfile 2013-12-06 13:01:27.000000000 +0100 +++ new/hawk-0.6.2+git.1387458085.5cd8197/hawk/Gemfile 2013-12-19 14:10:44.000000000 +0100 @@ -5,6 +5,9 @@ # sucks, but it's the least-worst solution I can find right now for # making Bundler go away when we neither need nor want it. # +# TODO(must): On openSUSE Factory, running `script/rails s` without a Gemfile +# doesn't work. It just sits there, and never answers any requests. +# # Have I mentioned lately that while Bundler may be "the best way to # manage a Ruby application's gems", it's an absolute menace if you're # trying to build packaged software? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/controllers/explorer_controller.rb new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/controllers/explorer_controller.rb --- old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/controllers/explorer_controller.rb 2013-12-06 12:20:30.000000000 +0100 +++ new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/controllers/explorer_controller.rb 2013-12-19 14:10:44.000000000 +0100 @@ -73,7 +73,13 @@ # Now we either generate if a report for that time doesn't exist, or display if one does. # TODO(must): this doesn't handle the case where a generate run fails utterly; it'll # probably just keep trying to generate the hb_report indefinitely. + pcmk_version = nil + m = %x[cibadmin -!].match(/^Pacemaker ([^ ]+) \(Build: ([^)]+)\)/) + pcmk_version = "#{m[1]}-#{m[2]}" if m if File.exists?(@report_path) + # Have to blow this away if it exists (i.e. is a cached report), else + # prior cibadmin calls on individual PE inputs will have wrecked their mtimes. + FileUtils.remove_entry_secure(@hb_report.path) if File.exists?(@hb_report.path) @peinputs = [] stdin, stdout, stderr, thread = Util.popen3("crm", "history") stdin.write("source #{@report_path}\npeinputs\n") @@ -90,6 +96,10 @@ :basename => File.basename(path, ".bz2"), :node => path.split(File::SEPARATOR)[-3] } + v = peinput_version(path) + @peinputs[-1][:info] = v == pcmk_version ? nil : (v ? + _("PE Input created by different Pacemaker version (%{version})" % { :version => v }) : + _("Pacemaker version not present in PE Input")) end # sort is going to be off for identical mtimes (stripped back to the second), # so need secondary sort by filename @@ -277,4 +287,10 @@ @hb_report.path = "#{@@x_path}/#{@report_name}" end + def peinput_version(path) + nvpair = %x[CIB_file=#{path} cibadmin -Q --xpath "/cib/configuration//crm_config//nvpair[@name='dc-version']" 2>/dev/null] + m = nvpair.match(/value="([^"]+)"/) + return nil unless m + m[1] + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/views/explorer/_pe_list.html.erb new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/views/explorer/_pe_list.html.erb --- old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/views/explorer/_pe_list.html.erb 2013-08-20 10:32:04.000000000 +0200 +++ new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/views/explorer/_pe_list.html.erb 2013-12-19 14:10:44.000000000 +0100 @@ -8,7 +8,7 @@ <div style="float: left; padding-right: 2em;"> <table id="peinputs" style="white-space: nowrap;"> <tr> - <th><%=h _('Time') %></th> + <th colspan="2"><%=h _('Time') %></th> <th><%=h _('PE Input') %></th> <th><%=h _('Node') %></th> </tr> @@ -19,6 +19,9 @@ %> <tr> <td><%=h peinput[:timestamp] %></td> + <td><span class="ui-icon ui-icon-info " <%=raw( + peinput[:info] ? "title=\"#{h peinput[:info]}\"" : 'style="display: none;"' + )%>></span></td> <td><%= link_to peinput[:basename], pe_get_path( :from_time => @from_time, :to_time => @to_time, :basename => peinput[:basename], :node => peinput[:node], @@ -40,8 +43,8 @@ :from_time => @from_time, :to_time => @to_time, :basename => peinput[:basename], :node => peinput[:node], :file => "graph", :format => "xml"), :target => "hawk-hist-info", :class => "pe-graph" %></td> - <% if (i % 2 == 0 && i < peinputs.count-1) %> - <td rowspan="2">} <%= link_to _("Diff"), pe_diff_path( + <% if i < peinputs.count-1 %> + <td><%= link_to _("Diff"), pe_diff_path( :from_time => @from_time, :to_time => @to_time, :left => peinputs[i+1][:basename], :right => peinput[:basename]), :target => "hawk-hist-info", :class => "pe-diff" %></td> <% end %> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
