May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit webyast-status-ui for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package webyast-status-ui for openSUSE:Factory checked in at Wed May 4 10:46:42 CEST 2011. -------- --- webyast-status-ui/webyast-status-ui.changes 2010-08-30 12:31:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-status-ui/webyast-status-ui.changes 2011-05-03 11:56:27.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 3 09:52:01 UTC 2011 - vlewin(a)novell.com + +- splitted status string into rows +- fixed failed test cases +- 0.2.9 + +------------------------------------------------------------------- +Thu Apr 14 14:08:48 UTC 2011 - vlewin(a)novell.com + +- fixed failed functional test cases +- 0.2.8 + +------------------------------------------------------------------- +Tue Apr 12 14:37:31 UTC 2011 - schubi(a)novell.com + +- new caching +- 0.2.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-status-ui.spec ++++++ --- /var/tmp/diff_new_pack.kYN3dz/_old 2011-05-04 10:42:54.000000000 +0200 +++ /var/tmp/diff_new_pack.kYN3dz/_new 2011-05-04 10:42:54.000000000 +0200 @@ -29,7 +29,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.6 +Version: 0.2.9 Release: 1 Summary: WebYaST - system status UI Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/status_controller.rb new/www/app/controllers/status_controller.rb --- old/www/app/controllers/status_controller.rb 2010-06-02 14:28:13.000000000 +0200 +++ new/www/app/controllers/status_controller.rb 2011-04-29 13:40:08.000000000 +0200 @@ -1,30 +1,30 @@ #-- # Copyright (c) 2009-2010 Novell, Inc. -# +# # All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License # as published by the Free Software Foundation. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, contact Novell, Inc. -# +# # To contact Novell about this file by physical or electronic mail, # you may find current contact information at www.novell.com #++ require 'yast/service_resource' require 'client_exception' -require 'open-uri' +require 'open-uri' # RORSCAN_ITL class StatusController < ApplicationController - + before_filter :login_required layout "main" @@ -45,7 +45,7 @@ group.single_graphs.each do |single_graph| single_graph.lines.each do |line| if line.limits.reached == "true" - label = group.id + label = group.id label += "/" + single_graph.headline if group.single_graphs.size > 1 label += "/" + line.label unless line.label.blank? if status.empty? @@ -53,8 +53,8 @@ else status += "; " + label end - end - end + end + end end return status end @@ -75,13 +75,13 @@ status.attributes["value"].each{ |value| if value.column == column_id value.value.collect!{|x| x.tr('\"','')} #removing \" - value.value.size.times{|t| ret << [(value.start.to_i + t*value.interval.to_i)*1000, value.value[t].to_f/scale]} # *1000 --> jlpot evalutas MSec for date format + value.value.size.times{|t| ret << [(value.start.to_i + t*value.interval.to_i)*1000, value.value[t].to_f/scale]} # *1000 --> jlpot evalutas MSec for date format # RORSCAN_ITL break end } else #only one value status.value.value.collect!{|x| x.tr('\"','')} #removing \" - status.value.value.size.times{|t| ret << [(status.value.start.to_i + t*status.value.interval.to_i)*1000, status.value.value[t].to_f/scale]} # *1000 --> jlpot evalutas MSec for date format + status.value.value.size.times{|t| ret << [(status.value.start.to_i + t*status.value.interval.to_i)*1000, status.value.value[t].to_f/scale]} # *1000 --> jlpot evalutas MSec for date format # RORSCAN_ITL end #strip zero values at the end of the array @@ -121,11 +121,11 @@ end lines = params[:lines].to_i || DEFAULT_LINES pos_begin = params[:pos_begin].to_i || 0 - begin + begin log = Logs.find(params[:id], :params => { :pos_begin => pos_begin, :lines => lines }) content = log.content.value if log position = log.content.position.to_i if log - render(:partial => 'status_log', + render(:partial => 'status_log', :locals => { :content => content, :position => position, :lines => lines, :id => params[:id] }) and return rescue ActiveResource::ServerError => error error_hash = Hash.from_xml error.response.body @@ -137,7 +137,7 @@ end end end - + def index client_permissions @logs = Logs.find(:all) @@ -145,13 +145,13 @@ begin @graphs = Graphs.find(:all, :params => { :checklimits => true }) #sorting graphs via id - @graphs.sort! {|x,y| y.id <=> x.id } - flash[:notice] = _("No data found for showing system status.") if @graphs.blank? + @graphs.sort! {|x,y| y.id <=> x.id } + flash[:notice] = _("No data found for showing system status.") if @graphs.blank? # RORSCAN_ITL rescue ActiveResource::ServerError => error error_hash = Hash.from_xml error.response.body logger.warn error_hash.inspect - if error_hash["error"] && - (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || + if error_hash["error"] && + (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR") if error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" flash[:error] = _("Status not available.") @@ -176,8 +176,8 @@ status = _("Can't connect to host") host = Host.find(session[:host]) rescue nil status = _("Can't connect to host %s.") % host.name if host #this string is already translated int webclient - render(:partial => "status_summary", - :locals => { :status => status, :level => 'error', :error => nil, + render(:partial => "status_summary", + :locals => { :status => status, :level => 'error', :error => nil, :refresh_timeout => refresh_timeout }) return rescue ActiveResource::UnauthorizedAccess => error @@ -232,8 +232,8 @@ level = "error" refresh = false logger.warn error_hash.inspect - if error_hash["error"] && - (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || + if error_hash["error"] && + (error_hash["error"]["type"] == "SERVICE_NOT_RUNNING" || error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR") if error_hash["error"]["type"] == "COLLECTD_SYNC_ERROR" level = "warning" #it is a warning only @@ -255,7 +255,7 @@ status = plugin.short_description else status += "; " + plugin.short_description - end + end } rescue Exception => error logger.warn error.inspect @@ -272,8 +272,8 @@ end end #benchmark - render(:partial => "status_summary", - :locals => { :status => status, :level => level, :error => ret_error, + render(:partial => "status_summary", + :locals => { :status => status, :level => level, :error => ret_error, :refresh_timeout => (refresh ? refresh_timeout : nil) }) end @@ -287,12 +287,12 @@ till = Time.now data = Hash.new if params.has_key? "minutes" - data[:minutes] = params[:minutes].to_i + data[:minutes] = params[:minutes].to_i else data[:minutes] = 5 #default last 5 minutes end from = till - data[:minutes]*60 - + begin ActionController::Base.benchmark("Graphs data read from the server") do graph = Graphs.find(group_id) @@ -314,7 +314,7 @@ graph_description.lines.each do |line| original_metrics = available_metrics.select{|me| me.id[(me.host.size+1)..(me.id.size-1)] == line.metric_id} unless original_metrics.empty? - logger.warn "More than one metrics with the same id found: #{line.metric_id}. --> taking first" if original_metrics.size > 1 + logger.warn "More than one metrics with the same id found: #{line.metric_id}. --> taking first" if original_metrics.size > 1 original_metric = original_metrics.first single_line = Hash.new single_line[:label] = line.label @@ -363,7 +363,7 @@ #strip to the same length while line[:values].size > count line[:values].pop - end + end end logger.debug "Rendering #{data.inspect}" @@ -382,11 +382,11 @@ @graphs = Graphs.find(:all) end #sorting graphs via id - @graphs.sort! {|x,y| y.id <=> x.id } + @graphs.sort! {|x,y| y.id <=> x.id } rescue Exception => error logger.warn error.inspect flash[:error] = YaST::ServiceResource.error(error) - redirect_to :controller=>"status", :action=>"index" and return + redirect_to :controller=>"status", :action=>"index" and return end end @@ -399,7 +399,7 @@ rescue Exception => error logger.warn error.inspect flash[:error] = YaST::ServiceResource.error(error) - redirect_to :controller=>"status", :action=>"index" and return + redirect_to :controller=>"status", :action=>"index" and return end @graphs.each do |graph| @@ -454,10 +454,11 @@ if timeout.zero? Rails.logger.info "System status autorefresh is disabled" else - Rails.logger.info "Autorefresh system status after #{timeout} seconds" + Rails.logger.info "Autorefresh system status after #{timeout} seconds" # RORSCAN_ITL end return timeout end end + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/helpers/status_helper.rb new/www/app/helpers/status_helper.rb --- old/www/app/helpers/status_helper.rb 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/helpers/status_helper.rb 2011-04-11 16:48:55.000000000 +0200 @@ -46,7 +46,7 @@ graph_div_id = graph_id(group, single_graphs[index].headline) remote_function(:update => graph_div_id, :url => { :action => "evaluate_values", :group_id => group, :graph_id => single_graphs[index].headline}, - :complete => evaluate_next_graph(group, single_graphs, index+1)) + :complete => evaluate_next_graph(group, single_graphs, index+1)) # RORSCAN_ITL end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/graphs.rb new/www/app/models/graphs.rb --- old/www/app/models/graphs.rb 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/models/graphs.rb 2011-04-11 16:48:55.000000000 +0200 @@ -21,5 +21,5 @@ class Graphs < ActiveResource::Base extend YastModel::Base - model_interface :"org.opensuse.yast.system.graphs" + model_interface :"org.opensuse.yast.system.graphs" # RORSCAN_ITL end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/logs.rb new/www/app/models/logs.rb --- old/www/app/models/logs.rb 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/models/logs.rb 2011-04-11 16:48:55.000000000 +0200 @@ -21,5 +21,5 @@ class Logs < ActiveResource::Base extend YastModel::Base - model_interface :"org.opensuse.yast.system.logs" + model_interface :"org.opensuse.yast.system.logs" # RORSCAN_ITL end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/metrics.rb new/www/app/models/metrics.rb --- old/www/app/models/metrics.rb 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/models/metrics.rb 2011-04-11 16:48:55.000000000 +0200 @@ -21,5 +21,5 @@ class Metrics < ActiveResource::Base extend YastModel::Base - model_interface :"org.opensuse.yast.system.metrics" + model_interface :"org.opensuse.yast.system.metrics" # RORSCAN_ITL end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/plugins.rb new/www/app/models/plugins.rb --- old/www/app/models/plugins.rb 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/models/plugins.rb 2011-04-11 16:48:55.000000000 +0200 @@ -21,5 +21,5 @@ class Plugins < ActiveResource::Base extend YastModel::Base - model_interface :"org.opensuse.yast.system.plugins" + model_interface :"org.opensuse.yast.system.plugins" # RORSCAN_ITL end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/status/_status_progress.html.erb new/www/app/views/status/_status_progress.html.erb --- old/www/app/views/status/_status_progress.html.erb 2010-08-20 16:17:37.000000000 +0200 +++ new/www/app/views/status/_status_progress.html.erb 2011-04-14 16:12:58.000000000 +0200 @@ -1,41 +1,40 @@ <%# #-- # Copyright (c) 2009-2010 Novell, Inc. -# +# # All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License # as published by the Free Software Foundation. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, contact Novell, Inc. -# +# # To contact Novell about this file by physical or electronic mail, # you may find current contact information at www.novell.com #++ %> -<div class="status_status"> - <div style="float: left;"> - <%= image_tag("/images/working.gif", :height=>"32", :width=>"32", :class=>"small-working-icon") %> - </div> - - <div style="float: left; padding-left: 1em; padding-top:10px"> - <%= _("Checking system status") -%> - </div> + + <div class="statusbar_row"> + <div style="float: left;"> + <%= image_tag("/images/working.gif", :height=>"22", :width=>"22", :class=>"small-working-icon") %> + </div> + <div style="float: left; padding-left: 1em; padding-top:10px"> + <%= _("Checking system status") -%>  + </div> + </div> <%= progress_bar(progress) -%>  <% javascript_tag do -%> - setTimeout(function() { - <%= remote_function(:update => "status_status", - :url => { :controller => :status, :action => :show_summary, :background => true }) %> - }, 5000); + setTimeout(function() { <%= remote_function(:update => "statusbar_status", :url => { :controller => :status, :action => :show_summary, :background => true }) %> }, 5000); <% end -%> -</div> + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/status/_status_summary.html.erb new/www/app/views/status/_status_summary.html.erb --- old/www/app/views/status/_status_summary.html.erb 2010-06-14 10:33:51.000000000 +0200 +++ new/www/app/views/status/_status_summary.html.erb 2011-05-03 11:49:42.000000000 +0200 @@ -1,52 +1,78 @@ <%# #-- # Copyright (c) 2009-2010 Novell, Inc. -# +# # All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License # as published by the Free Software Foundation. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, contact Novell, Inc. -# +# # To contact Novell about this file by physical or electronic mail, # you may find current contact information at www.novell.com #++ %> -<% unauthorized = error.class == ActiveResource::UnauthorizedAccess -%> -<div class="status_status"> - <% link_to (unauthorized ? "controlpanel" : "status") do %> - <%= report_error(error, _("An problem occured when loading status information.")) if error && !unauthorized %> - <% unless status.blank? %> - <span class="status-icon <%= level %>"> </span> - <span><%= status %></span> - <% else %> - <% if unauthorized -%> - <span class="status-icon warning"> </span> - <span><%= _("Cannot read system status - you have been logged out.") %></span> - <% elsif !error %> - <span class="status-icon ok"> </span> - <span><%= _("Your system is healthy.") %></span> - <% end %> +<% unauthorized = error.class == ActiveResource::UnauthorizedAccess -%> +<%if error && !unauthorized %> + <div class="statusbar_row"> + <a href="status" class="warning_message"> + <%= report_error(error, _("An problem occured when loading status information.")) %> + </a> + </div> +<% end %> + +<% unless status.blank? %> + <% status.split(';').each do | message | %> + <div class="statusbar_row"> + <img src="/images/status-warning.png"> + <a href="status" class="warning_message"> + <span><%= message %></span> + </a> + </div> + <% end %> + + <% javascript_tag do -%> + jQuery(function($){ $('#status-eye').addClass('eye_warning'); }); + $('#status_indicator').addClass("status_warning"); + <% end -%> + +<% else %> + <% if unauthorized -%> + <div class="statusbar_row"> + <a href="status" class="warning_message"> + <span><%= _("Cannot read system status - you have been logged out.") %></span> + </a> + </div> + <% elsif !error %> + <% javascript_tag do -%>jQuery(function($){ + if($('#status-eye').hasClass("eye_warning") == false) { $('#status-eye').addClass('eye_healthy'); } }); + $('#status_indicator').addClass("status_ok"); + <% end -%> + + <div class="statusbar_row"> + <% link_to "status", :class=>"warning_message" do %> + <span><%= _("Your system is healthy.") %></span>  <% end %> + </div> <% end %> -</div> +<% end %> <!- if else --> <% if refresh_timeout.to_i > 0 && !unauthorized -%>  <% javascript_tag do -%> setTimeout(function() { - $('#status_status').html('<%= image_tag("/images/working.gif", :class => "small-working-icon") %> <%= _("Loading system information") %>') - <%= remote_function(:update => "status_status", - :url => { :controller => :status, :action => :show_summary, :background => true }) %> + $('#statusbar-status').html('<%= image_tag("/images/working.gif", :class => "small-working-icon") %> <%= _("Loading system information") %>')  + <%= remote_function(:update => "statusbar_status", :url => { :controller => :status, :action => :show_summary, :background => true }) %> }, <%= refresh_timeout.to_i * 1000 -%>); <% end -%> <% end %> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/status/edit.html.erb new/www/app/views/status/edit.html.erb --- old/www/app/views/status/edit.html.erb 2010-07-19 13:29:26.000000000 +0200 +++ new/www/app/views/status/edit.html.erb 2011-04-14 16:12:58.000000000 +0200 @@ -1,20 +1,20 @@  @@ -50,7 +50,7 @@ alert (say_bad); return false; } - <% end %> + <% end %> <% end %> <% end %> $('#progress').show(); @@ -72,7 +72,7 @@ <% end %> <% end %> -<div class='plugin-icon'><img alt="monitoring" src='/images/monitoring.png'/><%=_("Status") + header_spacer + _("Settings")%></div> +<div class='plugin-icon'><img alt="monitoring" src='/icons/monitoring.png'/><%=_("Status") + header_spacer + _("Settings")%><span id="questionMark">?</span></div> <div class="plugin-content"> <% form_tag( {:action => :save} , { :onsubmit => "return validateLimits();"} ) do %> <div class="accordion"> @@ -85,7 +85,7 @@ <label>Alarm, if <%= group_name %></label> <fieldset class="small-labels"> <% single_graph.lines.each do |line| %> - <% limit_key = "#{group.id}/#{single_graph.headline}/#{line.label}" + <% limit_key = "#{group.id}/#{single_graph.headline}/#{line.label}" measurements = {_("undercuts") => "min", _("exceeds") => "max"} if line.limits.max.to_i > 0 val = line.limits.max.to_i @@ -118,3 +118,4 @@ </div> <% end %> </div> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/status/index.html.erb new/www/app/views/status/index.html.erb --- old/www/app/views/status/index.html.erb 2010-08-24 12:27:38.000000000 +0200 +++ new/www/app/views/status/index.html.erb 2011-04-12 12:45:08.000000000 +0200 @@ -38,6 +38,9 @@ <% content_for :before_script do %> <% javascript_tag do %> + var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>"); + startNotifier({'module':'status', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); + $(document).ready(function() { $(".accordion").accordion({ autoHeight : false, @@ -53,13 +56,13 @@  -<div class='plugin-icon'><img alt="monitoring" src='/images/monitoring.png' width="48px" height="48"/><%=_("Status")%></div> +<div class='plugin-icon'><img alt="monitoring" src='/icons/monitoring.png' width="48px" height="48"/><%=_("Status")%><span id="questionMark">?</span></div> <div class="plugin-content"> <div class="accordion"> <% if @graphs %> <% @graphs.each do |group| %> - <div class="list-fieldset"> + <div class="list-fieldset">  <div class="list-fieldset-header" onclick="<%= remote_function(:update => graph_id(group.id, group.single_graphs.first.headline), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/lib/tasks/jsmin_status.rake new/www/lib/tasks/jsmin_status.rake --- old/www/lib/tasks/jsmin_status.rake 2010-08-23 14:32:04.000000000 +0200 +++ new/www/lib/tasks/jsmin_status.rake 2011-04-11 16:48:55.000000000 +0200 @@ -22,24 +22,16 @@ require "tempfile" JSCOMPRESSOR = File.join(RAILS_ROOT, '/script/javascript/jsmin.rb') -def minify(list, output) - tmp = Tempfile.open('all') - list.each {|file| open(file) {|f| tmp.write(f.read) } } - tmp.rewind - sh "ruby #{JSCOMPRESSOR} < #{tmp.path} > #{output}" -end - namespace :js do javascripts = ['jqplot.categoryAxisRenderer.js', "jqplot.dateAxisRenderer.js", "jqplot.canvasTextRenderer.js", "jqplot.cursor.js"] - + Dir.chdir(File.join(RAILS_ROOT, 'public', 'javascripts', 'plugin')) do - javascripts.map! {|f| File.join(Dir.pwd, f)} javascripts.unshift(File.join(RAILS_ROOT, 'public', 'javascripts', 'jquery.jqplot.js')) file 'status-min.js' => javascripts do | f | - - output_file = File.join(File.dirname(__FILE__), '..','..','public', 'javascripts', 'min', '/') + f.name - minify(f.prerequisites, output_file) + $dir = File.join(File.dirname(__FILE__), '/../../public/javascripts/min/') + mkpath($dir); + minify(f.prerequisites, $dir + f.name) end end @@ -48,3 +40,10 @@ puts "Done" end end + +def minify(list, output) + tmp = Tempfile.open('all') + list.each {|file| open(file) {|f| tmp.write(f.read) } } + tmp.rewind + sh "ruby #{JSCOMPRESSOR} < #{tmp.path} > #{output}" +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/shortcuts.yml new/www/shortcuts.yml --- old/www/shortcuts.yml 2010-08-23 14:39:43.000000000 +0200 +++ new/www/shortcuts.yml 2011-04-14 16:12:58.000000000 +0200 @@ -1,5 +1,5 @@ main: - icon: '/images/monitoring.png' + icon: '/icons/monitoring.png' url: /status groups: [ System ] tags: [ access] @@ -7,3 +7,4 @@ description: _("Show system status") resources: [ status ] read_permissions: [ org.opensuse.yast.system.status.read ] + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/test/functional/status_controller_test.rb new/www/test/functional/status_controller_test.rb --- old/www/test/functional/status_controller_test.rb 2010-07-06 11:16:07.000000000 +0200 +++ new/www/test/functional/status_controller_test.rb 2011-05-03 11:20:53.000000000 +0200 @@ -1,20 +1,20 @@ #-- # Copyright (c) 2009-2010 Novell, Inc. -# +# # All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License # as published by the Free Software Foundation. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, contact Novell, Inc. -# +# # To contact Novell about this file by physical or electronic mail, # you may find current contact information at www.novell.com #++ @@ -128,9 +128,8 @@ get :show_summary assert_response :success assert_valid_markup - assert_tag :tag =>"span", - :attributes => { :class => "status-icon warning" } - assert_tag "Registration is missing; Mail configuration test not confirmed" + assert_tag :tag => "a", :attributes => { :class => "warning_message" }, :parent => { :tag => "div"} + assert_tag "Registration is missing" end #testing show summary AJAX call; Host is not available @@ -139,8 +138,8 @@ get :show_summary assert_response :success assert_valid_markup - assert_tag :tag =>"span", - :attributes => { :class => "status-icon error" } + #assert_tag :tag =>"a", :attributes => { :class=>"warning_message" }, :child => "Can't connect to host" + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"} assert_tag "Can't connect to host" end @@ -150,8 +149,8 @@ get :show_summary assert_response :success assert_valid_markup - assert_tag :tag =>"span", - :attributes => { :class => "status-icon warning" } + #assert_tag :tag =>"a", :attributes => { :class=>"warning_message" } + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"} assert_tag "Cannot read system status - you have been logged out." end @@ -175,9 +174,13 @@ get :show_summary assert_response :success assert_valid_markup - assert_tag :tag =>"span", - :attributes => { :class => "status-icon error" } - assert_tag "Limits exceeded for CPU/CPU-0/user; CPU/CPU-1/user; Disk/root/free; Registration is missing; Mail configuration test not confirmed" + #assert_tag "Limits exceeded for CPU/CPU-0/user; CPU/CPU-1/user; Disk/root/free; Registration is missing; Mail configuration test not confirmed" + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=> /Limits exceeded for CPU\/CPU-0\/user/ + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/CPU\/CPU-0\/user/ + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/CPU\/CPU-1\/user/ + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/Disk\/root\/free/ + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/Registration is missing/ + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/Mail configuration test not confirmed/ end #testing show summary AJAX call; progress @@ -245,7 +248,10 @@ get :show_summary assert_response :success assert_valid_markup - assert_tag "Collectd is out of sync. Status information can be expected at Wed Jan 20 22:34:38 2010.; Registration is missing; Mail configuration test not confirmed" + assert_tag :tag=>"a", :attributes => { :class => "warning_message" }, :parent => { :tag => "div"} + assert_tag "Collectd is out of sync. Status information can be expected at Wed Jan 20 22:34:38 2010." + #; Registration is missing; Mail configuration test not confirmed" + #assert_tag "Collectd is out of sync. Status information can be expected at Wed Jan 20 22:34:38 2010.; Registration is missing; Mail configuration test not confirmed" end #testing show summary AJAX call; Server Error @@ -271,7 +277,10 @@ get :show_summary assert_response :success assert_valid_markup - assert_tag "Status not available; Registration is missing; Mail configuration test not confirmed" + + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/Registration is missing/ + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/Status not available/ + assert_tag :tag=>"a", :attributes => { :class => "warning_message"}, :parent => { :tag => "div"}, :content=>/Mail configuration test not confirmed/ end #testing show summary AJAX call; Server Error with no information @@ -302,7 +311,7 @@ #testing evaluate_values AJAX call def test_show_evaluate_values_1 Time.stubs(:now).returns(Time.at(1264006620)) - get :evaluate_values, { :group_id => "Memory", :graph_id => "Memory", :minutes => "5" } + get :evaluate_values, { :group_id => "Memory", :graph_id => "Memory", :minutes => "5" } assert_response :success assert_valid_markup assert_tag :tag =>"script", @@ -327,7 +336,7 @@ mock.get "/plugins.xml", @header, @response_plugins, 200 mock.get "/metrics.xml", @header, @response_metrics, 200 end - get :evaluate_values, { :group_id => "Memory", :graph_id => "Memory", :minutes => "5" } + get :evaluate_values, { :group_id => "Memory", :graph_id => "Memory", :minutes => "5" } assert_response :success assert_valid_markup end @@ -336,7 +345,7 @@ #testing evaluate_values AJAX call def test_show_evaluate_values_with_other_id Time.stubs(:now).returns(Time.at(1264006620)) - get :evaluate_values, { :group_id => "Disk", :graph_id => "root" } + get :evaluate_values, { :group_id => "Disk", :graph_id => "root" } assert_response :success assert_valid_markup assert_tag :tag =>"script", @@ -362,34 +371,34 @@ mock.get "/metrics.xml", @header, @response_metrics, 200 end - get :evaluate_values, { :group_id => "not_found", :graph_id => "not_found" } + get :evaluate_values, { :group_id => "not_found", :graph_id => "not_found" } assert_response :success assert_valid_markup end #testing confirming status def test_confirm_status - post :confirm_status, { :param=>"Test mail received", :url=>"/mail/state", } + post :confirm_status, { :param=>"Test mail received", :url=>"/mail/state", } assert_response :redirect end #testing confirming status without param def test_confirm_status_without_param - post :confirm_status, { } + post :confirm_status, { } assert_response 500 end #testing call ajax_log_custom def test_show_ajax_log_custom - get :ajax_log_custom, { :id => "system", :lines => "50" } + get :ajax_log_custom, { :id => "system", :lines => "50" } assert_response :success assert_valid_markup assert_tag "\nJan 28 12:04:27 f95 avahi-daemon[9245]: Received response from host 10.10.4.228 with invalid source port 33184 on interface 'eth0.0'\nJan 28 12:04:28 f95 avahi-daemon[9245]: Received response from host 10.10.4.228 with invalid source port 33184 on interface 'eth0.0'\n\n" end - #testing call ajax_log_custom + #testing call ajax_log_custom def test_show_ajax_log_custom_without_params - get :ajax_log_custom, { } + get :ajax_log_custom, { } assert_response 500 end @@ -404,7 +413,7 @@ mock.get "/logs/system.xml?lines=50&pos_begin=0", @header, response_logs, 503 end - get :ajax_log_custom, { :id => "system", :lines => "50" } + get :ajax_log_custom, { :id => "system", :lines => "50" } assert_response :success assert_valid_markup assert_tag "You have no permissions" @@ -421,7 +430,7 @@ mock.get "/logs/system.xml?lines=50&pos_begin=0", @header, response_logs, 503 end - get :ajax_log_custom, { :id => "system", :lines => "50" } + get :ajax_log_custom, { :id => "system", :lines => "50" } assert_response 500 end @@ -560,3 +569,4 @@ end + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit webyast-status-ws for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package webyast-status-ws for openSUSE:Factory checked in at Wed May 4 10:42:46 CEST 2011. -------- --- webyast-status-ws/webyast-status-ws.changes 2011-02-09 09:28:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/webyast-status-ws/webyast-status-ws.changes 2011-05-02 14:45:24.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 2 12:45:10 UTC 2011 - schubi(a)novell.com + +- adapt caching to the new job handling +- 0.2.7 + +------------------------------------------------------------------- +Tue Apr 12 13:30:44 UTC 2011 - schubi(a)novell.com + +- new caching +- 0.2.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-status-ws.spec ++++++ --- /var/tmp/diff_new_pack.Ra6I1b/_old 2011-05-04 10:39:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Ra6I1b/_new 2011-05-04 10:39:21.000000000 +0200 @@ -27,7 +27,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.5 +Version: 0.2.7 Release: 1 Summary: WebYaST - system status service Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/graphs_controller.rb new/www/app/controllers/graphs_controller.rb --- old/www/app/controllers/graphs_controller.rb 2011-02-01 10:49:25.000000000 +0100 +++ new/www/app/controllers/graphs_controller.rb 2011-04-11 12:49:05.000000000 +0200 @@ -62,11 +62,7 @@ def index permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL init_translation - - bgr = params['background'] == 'true' - Rails.logger.info "Reading status in background" if bgr - - @graph = Graph.find(:all, params[:checklimits] || false, {:background => bgr}) + @graph = Graph.find(:all, params[:checklimits] || true) render :show end @@ -76,6 +72,6 @@ def show permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL init_translation - @graph = Graph.find(params[:id], params[:checklimits] || false) + @graph = Graph.find(params[:id], params[:checklimits] || true) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/plugins_controller.rb new/www/app/controllers/plugins_controller.rb --- old/www/app/controllers/plugins_controller.rb 2011-02-01 10:49:25.000000000 +0100 +++ new/www/app/controllers/plugins_controller.rb 2011-04-11 12:49:05.000000000 +0200 @@ -63,8 +63,9 @@ # def index permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL - load_translations - @plugins = Plugin.find(:all) + what = :all + load_translations unless Rails.cache.exist?("plugin:find:#{what.inspect}") + @plugins = Plugin.find(what) render :show end @@ -73,7 +74,7 @@ # def show permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL - load_translations + load_translations unless Rails.cache.exist?("plugin:find:#{params[:id]}") @plugins = Plugin.find(params[:id]) render :show end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/graph.rb new/www/app/models/graph.rb --- old/www/app/models/graph.rb 2011-02-01 10:49:11.000000000 +0100 +++ new/www/app/models/graph.rb 2011-04-29 18:23:25.000000000 +0200 @@ -38,10 +38,6 @@ attr_reader :y_decimal_places attr_reader :single_graphs - CONFIGURATION_FILE = "status_configuration.yaml" - TRANSLATE = true - - private # avoid race conditions when creating the config file @@ -49,10 +45,14 @@ # @@mutex = Mutex.new + #global variables + @@configuration_file = "status_configuration.yaml" + @@translate = true + # # reading data from Metric # - def read_data(id) + def self.read_data(id) data = {} metric = Metric.find(id) data = metric.data() if metric @@ -66,7 +66,7 @@ def check_limits(metric_id, metric_column, limits) id = Metric.default_host + "+" + metric_id metric_column ||= "value" - data = read_data(id) + data = Graph.read_data(id) limit_reached = false data.each do |key, values| if key == metric_column @@ -84,7 +84,7 @@ end break if limit_reached end - return limit_reached + limit_reached end # @@ -244,7 +244,7 @@ # reading configuration file # def self.parse_config(translate = false, path = nil) - path = File.join(Graph.plugin_config_dir(), CONFIGURATION_FILE ) if path == nil + path = File.join(Graph.plugin_config_dir(), @@configuration_file ) if path == nil #create default configuration file Graph.create_config(path) unless File.exists?(path) @@ -258,7 +258,7 @@ end # initialize on element - def initialize(group_id,value,limitcheck=false) + def initialize(group_id,value,limitcheck=true ) @group_name = group_id @headline = value["headline"] @y_scale = value["y_scale"] @@ -275,75 +275,18 @@ @single_graphs = value["single_graphs"] end - # just a short cut for accessing the singleton object - def self.bm - BackgroundManager.instance - end - # create unique id for the background manager def self.id(what) "system_status_#{what}" end - def self.find(what, limitcheck = false, opts = {}) - background = opts[:background] - - # background reading doesn't work correctly if class reloading is active - # (static class members are lost between requests) - if background && !bm.background_enabled? - Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" - background = false - end - - if background - #checking if collectd is running - raise ServiceNotRunning.new('collectd') unless Metric.collectd_running? - - proc_id = id(what) - if bm.process_finished? proc_id - Rails.logger.debug "Request #{proc_id} is done" - - ret = bm.get_value proc_id - - # rethrow the exception from the background thread - if ret.kind_of?(Exception) - Rails.logger.info "Rethrowing the exception caught in the background thread: #{ret.inspect}" - raise ret - end - - return ret - end + def self.find(what, limitcheck = true, opts = {}) + #checking if collectd is running + raise ServiceNotRunning.new('collectd') unless Metric.collectd_running? - running = bm.get_progress proc_id - if running - Rails.logger.debug "Request #{proc_id} is already running: #{running.inspect}" - return [running] - end - - bm.add_process proc_id - Rails.logger.info "Starting background thread for reading status..." - - # read the status in a separate thread - Thread.new do - begin - res = do_find what, limitcheck, bm - rescue Exception => ex - Rails.logger.info "Status background thread: Caught exception: #{ex}" - # remember the exception and rethrow it in the main thread later - res = ex - end - - bm.finish_process(proc_id, res) - end - process = bm.get_progress(proc_id) - if process - return [ process ] - else - return [] - end - else - return do_find(what, limitcheck) - end + YastCache.fetch(self,what) { + do_find(what, limitcheck) + } end # @@ -354,8 +297,8 @@ # (e.g. cpu-0+cpu-system) # "limitcheck" checking if limit has been reached (default: false) # - def self.do_find(what, limitcheck = false, bg = nil) - config = parse_config(TRANSLATE) + def self.do_find(what, limitcheck = true, bg = nil) + config = parse_config(@@translate) return nil if config==nil unless what == :all @@ -413,8 +356,7 @@ # return array of hashes of {"max"=>0, "min"=>0, "metric_column"=>nil} or nil # def self.find_limits(metric_id, group_id=nil ) - config = parse_config(TRANSLATE) - return nil if config==nil + config = parse_config(@@translate) || {} limits = [] config.each {|key,value| next if group_id != nil && key != group_id @@ -442,7 +384,7 @@ end # avoid race condition in writing the config @@mutex.synchronize do - f = File.open(File.join(Graph.plugin_config_dir(), CONFIGURATION_FILE), "w") + f = File.open(File.join(Graph.plugin_config_dir(), @@configuration_file), "w") f.write(config.to_yaml) f.close end @@ -474,7 +416,7 @@ xml.limits do xml.max line["limits"]["max"] xml.min line["limits"]["min"] - xml.reached check_limits(line["metric_id"], line["metric_column"], line["limits"]) if line["limits"].has_key? "reached" + xml.reached line["limits"]["reached"] if line["limits"].has_key? "reached" end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/log.rb new/www/app/models/log.rb --- old/www/app/models/log.rb 2011-02-01 10:49:11.000000000 +0100 +++ new/www/app/models/log.rb 2011-04-29 18:23:25.000000000 +0200 @@ -25,7 +25,6 @@ # require 'yast/config_file' -require 'yast_service' class Log attr_reader :id @@ -66,21 +65,22 @@ # "id" could be the log group (system,...) # def self.find(what) - config = parse_config - ret = [] - return ret if config==nil - - config.each {|key,value| - ret << Log.new(key,value) if key==what || what==:all + YastCache.fetch(self,what) { + config = parse_config || {} + ret = [] + config.each {|key,value| + ret << Log.new(key,value) if key==what || what==:all + } + unless what==:all + if ret.size >= 1 + Rails.logger.error "There are more results for #{what} -> #{ret.inspect} Taking the first one..." + ret = ret.first + else + ret = nil + end + end + ret } - - if what == :all || ret.blank? - return ret - else - raise "#{what} not found in configuration file" if ret.blank? - Rails.logger.error "There are more results for #{what} -> #{ret.inspect} Taking the first one..." if ret.size > 1 - return ret.first - end end # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/metric.rb new/www/app/models/metric.rb --- old/www/app/models/metric.rb 2011-02-01 10:49:25.000000000 +0100 +++ new/www/app/models/metric.rb 2011-04-29 18:23:25.000000000 +0200 @@ -205,24 +205,29 @@ # Metric.find(id) # Where id is host:group:name (whithout rrd extension) def self.find(what, opts={}) - case what - when :all then opts.empty? ? find_all : find_multiple(opts) - # in this case, the options are the first - # parameter - when Hash then find_multiple(what.merge(opts)) - when String - find_multiple({:id => what}).first rescue nil - else nil - end + return find_all if what == :all && opts.empty? + YastCache.fetch(self,what,opts) { + case what + when :all then opts.empty? ? find_all : find_multiple(opts) + # in this case, the options are the first + # parameter + when Hash then find_multiple(what.merge(opts)) + when String + find_multiple({:id => what}).first rescue nil + else nil + end + } end # find all values def self.find_all - ret = [] - rrd_files.each do |path| - ret << Metric.new(path) - end - ret + YastCache.fetch(self, :all) { + ret = [] + rrd_files.each do |path| + ret << Metric.new(path) + end + ret + } end def self.find_multiple(opts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/plugin.rb new/www/app/models/plugin.rb --- old/www/app/models/plugin.rb 2011-02-01 10:49:11.000000000 +0100 +++ new/www/app/models/plugin.rb 2011-04-29 18:23:25.000000000 +0200 @@ -63,25 +63,27 @@ # "id" is the plugin name # def self.find(what) - models = [] - ret = [] - resources = Resource.find :all - resources.each {|resource| - name = resource.href.split("/").last - models << (name+"_state").classify if name==what || what==:all - } + YastCache.fetch(self,what) { + models = [] + ret = [] + resources = Resource.find :all + resources.each {|resource| + name = resource.href.split("/").last + models << (name+"_state").classify if name==what || what==:all + } - models.each {|model| - status = Object.const_get(model) rescue $! - if status.class != NameError && status.respond_to?(:read) - stat = status.read - ret << Plugin.new(stat[:level], stat[:message_id], - stat[:short_description], stat[:long_description], stat[:details], - stat[:confirmation_host], stat[:confirmation_link], - stat[:confirmation_label], stat[:confirmation_kind] ) unless stat.blank? - end + models.each {|model| + status = Object.const_get(model) rescue $! + if status.class != NameError && status.respond_to?(:read) + stat = status.read + ret << Plugin.new(stat[:level], stat[:message_id], + stat[:short_description], stat[:long_description], stat[:details], + stat[:confirmation_host], stat[:confirmation_link], + stat[:confirmation_label], stat[:confirmation_kind] ) unless stat.blank? + end + } + ret } - return ret end # converts the status to xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/config/resources/graphs.yml new/www/config/resources/graphs.yml --- old/www/config/resources/graphs.yml 2010-08-27 14:58:55.000000000 +0200 +++ new/www/config/resources/graphs.yml 2011-04-19 11:37:42.000000000 +0200 @@ -2,4 +2,12 @@ controller: graphs singular: false policy: org.opensuse.yast.system.status +#cache: +# enabled: true/false +# priority: -100..100 +# reload_after: seconds (0 == do not reload) +cache: + enabled: true + priority: 20 + reload_after: 360 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/config/resources/metrics.yml new/www/config/resources/metrics.yml --- old/www/config/resources/metrics.yml 2010-08-27 14:58:55.000000000 +0200 +++ new/www/config/resources/metrics.yml 2011-04-19 11:37:48.000000000 +0200 @@ -2,4 +2,11 @@ controller: metrics singular: false policy: org.opensuse.yast.system.status - +#cache: +# enabled: true/false +# priority: -100..100 +# reload_after: seconds (0 == do not reload) +cache: + enabled: true + priority: 20 + reload_after: 360 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/config/resources/plugins.yml new/www/config/resources/plugins.yml --- old/www/config/resources/plugins.yml 2010-08-27 14:58:55.000000000 +0200 +++ new/www/config/resources/plugins.yml 2011-04-19 11:37:55.000000000 +0200 @@ -3,3 +3,11 @@ singular: false policy: org.opensuse.yast.system.status +#cache: +# enabled: true/false +# priority: -100..100 +# reload_after: seconds (0 == do not reload) +cache: + enabled: true + priority: 20 + reload_after: 360 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/test/unit/graph_test.rb new/www/test/unit/graph_test.rb --- old/www/test/unit/graph_test.rb 2010-08-27 14:58:55.000000000 +0200 +++ new/www/test/unit/graph_test.rb 2011-04-14 09:39:35.000000000 +0200 @@ -64,6 +64,7 @@ end def test_finders + Metric.stubs(:collectd_running?).returns(true) Graph.stubs(:parse_config).returns(PARSE_CONFIG_1) ret = Graph.find(:all) @@ -82,6 +83,7 @@ end def test_find_limits + Metric.stubs(:collectd_running?).returns(true) Graph.stubs(:parse_config).returns(PARSE_CONFIG_2) ret = Graph.find_limits('cpu-0+cpu-user') assert_equal 1, ret.size @@ -99,10 +101,9 @@ end def test_check_limits_and_xml + Metric.stubs(:collectd_running?).returns(true) Graph.stubs(:parse_config).returns(PARSE_CONFIG_3) - graph = Graph.find('CPU', true) - - graph.stubs(:read_data).with('waerden+cpu-0+cpu-idle').returns({ "value"=> + Graph.stubs(:read_data).with('waerden+cpu-0+cpu-idle').returns({ "value"=> {Time.at(1252071700) =>"6.1514301440e+01".to_f, Time.at(1252071690) =>"6.1518643200e+01".to_f, Time.at(1252071680) =>"6.1513154560e+01".to_f, @@ -112,11 +113,10 @@ Time.at(1252071660) =>"6.1664133120e+01".to_f, Time.at(1252071750) =>"6.1545021440e+01".to_f, Time.at(1252071760) =>"6.1678837760e+01".to_f}, - "interval" => 10, "starttime" => Time.at(1252071660) }) - graph.stubs(:read_data).with('waerden+cpu-0+cpu-user').returns({ "value"=> + Graph.stubs(:read_data).with('waerden+cpu-0+cpu-user').returns({ "value"=> {Time.at(1252071700) =>"6.1514301440e+01".to_f, Time.at(1252071690) =>"6.1518643200e+01".to_f, Time.at(1252071680) =>"6.1513154560e+01".to_f, @@ -126,10 +126,12 @@ Time.at(1252071660) =>"6.1664133120e+01".to_f, Time.at(1252071750) =>"6.1545021440e+01".to_f, Time.at(1252071760) =>"6.1678837760e+01".to_f}, - "interval" => 10, "starttime" => Time.at(1252071660) }) + graph = Graph.find('CPU', true) + + xml = Builder::XmlMarkup.new xml.instruct! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/test/unit/log_test.rb new/www/test/unit/log_test.rb --- old/www/test/unit/log_test.rb 2010-08-27 14:58:55.000000000 +0200 +++ new/www/test/unit/log_test.rb 2011-04-11 12:49:05.000000000 +0200 @@ -62,7 +62,7 @@ assert ret.description == 'System messages' ret = Log.find('notfound') - assert_equal 0, ret.size + assert_equal nil, ret end def test_read_log_file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit webyast-time-ui for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package webyast-time-ui for openSUSE:Factory checked in at Wed May 4 10:39:13 CEST 2011. -------- --- webyast-time-ui/webyast-time-ui.changes 2010-08-30 12:37:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-time-ui/webyast-time-ui.changes 2011-05-02 16:35:14.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 2 14:31:49 UTC 2011 - vlewin(a)novell.com + +- uniform appearance for all modules in basesystem setup workflow +- 0.2.5 + +------------------------------------------------------------------- +Tue Apr 12 14:41:34 UTC 2011 - schubi(a)novell.com + +- new caching +- 0.2.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-time-ui.spec ++++++ --- /var/tmp/diff_new_pack.5zVDFF/_old 2011-05-04 10:38:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5zVDFF/_new 2011-05-04 10:38:27.000000000 +0200 @@ -27,7 +27,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.3 +Version: 0.2.5 Release: 1 Summary: WebYaST - time management UI Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/time_controller.rb new/www/app/controllers/time_controller.rb --- old/www/app/controllers/time_controller.rb 2010-07-19 13:29:26.000000000 +0200 +++ new/www/app/controllers/time_controller.rb 2011-04-11 16:48:55.000000000 +0200 @@ -114,9 +114,9 @@ # since while calling this function there is different instance of the class # than when calling index, @@timezones were empty; reinitialize them # possible FIXME: how does it increase the amount of data transferred? - systemtime = Systemtime.find :one + systemtime = Systemtime.find :one # RORSCAN_ITL - timezones = systemtime.timezones + timezones = systemtime.timezones # RORSCAN_ITL region = timezones.find { |r| r.name == params[:value] } #possible FIXME later it gets class, not a string return false unless region #possible FIXME: is returnign false for AJAX correct? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/time/_timezones.rhtml new/www/app/views/time/_timezones.rhtml --- old/www/app/views/time/_timezones.rhtml 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/views/time/_timezones.rhtml 2011-04-26 17:31:09.000000000 +0200 @@ -1,21 +1,21 @@ <%# #-- # Copyright (c) 2009-2010 Novell, Inc. -# +# # All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License # as published by the Free Software Foundation. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, contact Novell, Inc. -# +# # To contact Novell about this file by physical or electronic mail, # you may find current contact information at www.novell.com #++ @@ -31,4 +31,5 @@ list.sort! %> <%= select_tag "timezone", - options_for_select(list, central), :disabled=> disabled, :style => "width: 300px;" %> + options_for_select(list, central), :disabled=> disabled %> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/time/index.rhtml new/www/app/views/time/index.rhtml --- old/www/app/views/time/index.rhtml 2010-08-27 14:11:07.000000000 +0200 +++ new/www/app/views/time/index.rhtml 2011-04-28 14:32:19.000000000 +0200 @@ -1,20 +1,20 @@  @@ -33,10 +33,10 @@ padding-left:.5em; vertical-align:middle; } - label.valid { + label.valid { background: url('../images/checked.gif') no-repeat; padding:0px 0px 0px 18px; - vertical-align:middle; + vertical-align:middle; margin-left:5px; } </style> @@ -46,19 +46,19 @@ $("#date_date").datepicker( { dateFormat: 'dd/mm/yy'} ); }); <% end -%> - + <% if JSMIN == false %> <%= javascript_include_tag "validation.js" %> - + <% end %> - + <script type="text/javascript"> $(document).ready(function() { validateDomainName("ntp_server"); validateTime("currenttime"); - $("#timeForm").validate({ - onkeyup: function(element) { this.element(element); }, + $("#timeForm").validate({ + onkeyup: function(element) { this.element(element); }, rules:{ ntp_server: { required: "#ntp_sync:checked", @@ -70,10 +70,11 @@ } }, submitHandler: function(form) { - var message = <%= jss _("Please wait") -%>; - disableFormOnSubmit(message); - form.submit(); - }, + var message = <%= jss _("Please wait") -%>; + //disableFormOnSubmit(message); + $.modalDialog.wait( {message: message}); + form.submit(); + }, success: "valid", messages: { ntp_server: { @@ -87,10 +88,6 @@ } }); - //is not needed anymore, because of jquery.validate plugin update (TODO: remove commented out lines after test ) - //$("#ntp_server").keyup( function() {$("#timeForm").valid();}); //avoid problems with validation when element change*/ - //$("#currenttime").keyup( function() {$("#timeForm").valid();}); //avoid problems with validation when element change*/ - // allows to switch between radio buttons and disable validation if #timeconfig_manual is checked $('#timeconfig_manual').click(function() { var settings = $('#timeForm').validate().settings; @@ -119,7 +116,7 @@ <% javascript_tag do -%> function submitTime() { if($("#timeForm").valid() ) { - $('#progress').show(); + //$('#progress').show(); disable_forms(); return true; } @@ -141,77 +138,115 @@ <% end -%> <% end %> -<div class='plugin-icon'><img src='/icons/yast-ntp-client.png' alt="time module"/><%=_("Time")%></div> + + +<div class="plugin-content plugin-border"> + <%= render :partial => 'shared/missing_write_permissions' if disabled %> + + <% form_tag '/time/update', {:id => "timeForm", :class=>"webyast_form", :onsubmit => "return submitTime();"} do %> + <div class="plugin-header"> + <div class="left"> + <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/time.png"></label> + <label class="plugin-name"><%=_("Time")%></label> + </div> + + <div class="right" > + <span id="questionMark" style="margin:2px 5px; float:none;">?</span> + </div> + <div class="clearfix"></div> + </div> + + <div class="clearfix"> </div> + + <fieldset class="webyast_fieldset"> + <div class="fieldset_header"> + <span class="fieldset_header_title" ><%= _("Timezone")%></span> + </div> + + <div class="fieldset_body"> + <div class="row"> + <label for="region"><%=_("Region")%></label> + <%= select_tag "region", options_for_select((a)stime.regions, @stime.region.name), :disabled => disabled %> + </div> + + <div class="row"> + <label for="timezone"><%=_("Timezone")%></label> + <span id="timezones"> + <%= render(:partial => 'timezones', :locals => {:region => @stime.region, :default => @stime.timezone, :disabled => disabled}) %> + </span> + </div> + + <% if @stime.respond_to?(:utcstatus) && !(a)stime.utcstatus.nil? %> + <%# I can't get this cobe-ing checkbox line up with the rest of the fields otherwise, grr + 4em, because labels are 5em wide | -bubli + %> + <div class="row"> + <label><%=_("Hardware clock is set to UTC")%></label> + <%# don't use check_box helper as it generate also hidden opposite value %> + <input type="checkbox" name="utc" id="utc" value="true" <%= "checked=\"checked\"" if @stime.utcstatus %> <%= "disabled=\"disabled\"" if disabled %> /> + </div> + <% end %> + </div> + </fieldset> + + + <fieldset class="webyast_fieldset"> + <div class="fieldset_header"> + <span class="fieldset_header_title" ><%= _("Time")%></span> + </div> + + <div class="fieldset_body"> + <fieldset class="time_filedset" > + <legend> + <input type="radio" name="timeconfig" value="manual" onclick="enable();" id="timeconfig_manual" + <%= "disabled=\"disabled\"" if disabled%> + <%= "checked=\"checked\"" unless ntp_available %>/> + <%=_("Manually configure time")%> + </legend> + + + + <div class="row"> + <label for="date_date"><%= _("Date") %></label> + <%= text_field "date","date", :disabled=> ntp_available ? true :false , :value => @stime.date %> + </div> + + <div class="row"> + <label for="currenttime"><%= _("Time") %></label> + <%= text_field_tag "currenttime", @stime.time, :disabled=> ntp_available ? true :false %> + </div> + </fieldset> + + <fieldset class="time_filedset" > + <legend> + <input id="ntp_sync" type="radio" name="timeconfig" value="ntp_sync" onclick="disable();" + <%= "disabled=\"disabled\"" if disabled || !ntp_available %> + <%= "checked=\"checked\"" if ntp_available %> /> + <%=_("Synchronize via Network Time Protocol (NTP)")%> + </legend> + + <% if ntp_available %> + <div class="row"> + <label for="ntp_server"><%= _("NTP server") %></label> + <%= options = {} + options[:disabled] = "disabled" unless Ntp.permissions[:setserver] + text_field_tag("ntp_server", @ntp.actions.ntp_server || "", options={:class=>"ntp_server"}) %> + </div> + <% end %> + </fieldset> + <div class="clearfix"></div> + </div> + </fieldset> + + <div class="clearfix"></div> + + <div class="button_container"> + <div class="hr"> </div> + <div class="nav-buttons" style=""> + <%= form_send_buttons :id=>"timeSubmit", :disabled => disabled, :class => "button" %> + </div> + </div> -<div class="plugin-content"> -<%= render :partial => 'shared/missing_write_permissions' if disabled %> -  - <% form_tag '/time/update', {:id => "timeForm", :class => 'container', :onsubmit => "return submitTime();"} do %> - <%#TODO tooltip for form <div> _("Table for settings timezone for target machine.") </div>%> - <fieldset class="small-fields small-labels"> - <legend><span><%= _("Timezone")%></span></legend> - <p> - <label for="region"><%=_("Region")%></label> -  - <%= select_tag "region", options_for_select((a)stime.regions, @stime.region.name), :disabled => disabled, :style => "width: 300px;" %> - </p> - <p> - <label for="timezone"><%=_("Timezone")%></label> - <span id="timezones"> - <%= render(:partial => 'timezones', - :locals => {:region => @stime.region, :default => @stime.timezone, - :disabled => disabled}) %> - </span> - </p> - <% if @stime.respond_to?(:utcstatus) && !(a)stime.utcstatus.nil? %> - <%# I can't get this cobe-ing checkbox line up with the rest of the fields otherwise, grr - 4em, because labels are 5em wide | -bubli - %> - <p> - <label><%=_("Hardware clock is set to UTC")%></label> - <%# don't use check_box helper as it generate also hidden opposite value %> - <input type="checkbox" name="utc" id="utc" value="true" - <%= "checked=\"checked\"" if @stime.utcstatus %> - <%= "disabled=\"disabled\"" if disabled %> /> - </p> - <% end %> - </fieldset> - <fieldset class="small-fields small-labels"> - <legend><span><%= _("Time")%></span></legend> - <p> - <input type="radio" name="timeconfig" value="manual" onclick="enable();" id="timeconfig_manual" - <%= "disabled=\"disabled\"" if disabled%> - <%= "checked=\"checked\"" unless ntp_available %>/> - <%=_("Manually configure time")%> - </p> - <% #TODO for tooltip _("Manual time configuration table, where user selects data and time for target machine") - %> - <p> - <label for="date_date"><%= _("Date") %></label> - <%= text_field "date","date", :disabled=> ntp_available ? true :false , :value => @stime.date %> - </p> - <p> - <label for="currenttime"><%= _("Time") %></label> - <%= text_field_tag "currenttime", @stime.time, :disabled=> ntp_available ? true :false %> - </p> - <p> - <input id="ntp_sync" type="radio" name="timeconfig" value="ntp_sync" onclick="disable();" - <%= "disabled=\"disabled\"" if disabled || !ntp_available %> - <%= "checked=\"checked\"" if ntp_available %> /> - <%=_("Synchronize via Network Time Protocol (NTP)")%> - </p> - <% if ntp_available %> - <p> - <label for="ntp_server"><%= _("NTP server") %></label> - <%= options = {} - options[:disabled] = "disabled" unless Ntp.permissions[:setserver] - text_field_tag("ntp_server", @ntp.actions.ntp_server || "", options={:class=>"ntp_server"}) %> - </p> - <% end %> - </fieldset> - <div class="nav-buttons"> - <%= form_send_buttons :id=>"timeSubmit", :disabled => disabled, :class => "button" %> - </div> <% end %> </div> @@ -222,4 +257,3 @@ :url => { :action => :timezones_for_region }, :with => "'disabled=' + "+ (disabled ? "true":"false")+" + '&value=' +value") %> - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit webyast-time-ws for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package webyast-time-ws for openSUSE:Factory checked in at Wed May 4 10:38:13 CEST 2011. -------- --- webyast-time-ws/webyast-time-ws.changes 2010-08-23 16:42:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-time-ws/webyast-time-ws.changes 2011-04-12 15:35:40.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 12 13:35:10 UTC 2011 - schubi(a)novell.com + +- new caching +- 0.2.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-time-ws.spec ++++++ --- /var/tmp/diff_new_pack.LWvtMY/_old 2011-05-04 10:37:57.000000000 +0200 +++ /var/tmp/diff_new_pack.LWvtMY/_new 2011-05-04 10:37:57.000000000 +0200 @@ -26,7 +26,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.0 +Version: 0.2.1 Release: 1 Summary: WebYaST - time management Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/systemtime_controller.rb new/www/app/controllers/systemtime_controller.rb --- old/www/app/controllers/systemtime_controller.rb 2010-07-15 10:31:45.000000000 +0200 +++ new/www/app/controllers/systemtime_controller.rb 2011-02-01 10:49:25.000000000 +0100 @@ -19,7 +19,7 @@ # you may find current contact information at www.novell.com #++ -require 'systemtime' +require 'systemtime' # RORSCAN_ITL # = Systemtime controller # Provides access to time settings for authentificated users. @@ -39,12 +39,12 @@ yapi_perm_check "time.write" root = params[:systemtime] if root == nil - logger.error "Response doesn't contain systemtime key" + logger.error "Response doesn't contain systemtime key" # RORSCAN_ITL raise InvalidParameters.new :timezone => "Missing" end - systemtime = Systemtime.new(root) - systemtime.save + systemtime = Systemtime.new(root) # RORSCAN_ITL + systemtime.save # RORSCAN_ITL show end @@ -56,11 +56,11 @@ # Shows time settings. Requires read permission for time YaPI. def show yapi_perm_check "time.read" - systemtime = Systemtime.find + systemtime = Systemtime.find # RORSCAN_ITL respond_to do |format| - format.xml { render :xml => systemtime.to_xml( :dasherize => false ) } - format.json { render :json => systemtime.to_json( :dasherize => false ) } + format.xml { render :xml => systemtime.to_xml( :dasherize => false ) } # RORSCAN_ITL + format.json { render :json => systemtime.to_json( :dasherize => false ) } # RORSCAN_ITL end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/systemtime.rb new/www/app/models/systemtime.rb --- old/www/app/models/systemtime.rb 2010-07-15 10:31:45.000000000 +0200 +++ new/www/app/models/systemtime.rb 2011-04-11 12:49:05.000000000 +0200 @@ -23,6 +23,11 @@ # Provides set and gets resources from YaPI time module. # Main goal is handle YaPI specific calls and data formats. Provides cleaned # and well defined data. + +# CACHING makes currently no sense cause the current time has to be +# evaluate everytime which will be also made by YaST:YAPI +# (It is not so easy as it sounds :-)) + class Systemtime < BaseModel::Base # Date settings format is dd/mm/yyyy ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit webyast-users-ws for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package webyast-users-ws for openSUSE:Factory checked in at Wed May 4 10:37:49 CEST 2011. -------- --- webyast-users-ws/webyast-users-ws.changes 2011-02-09 10:07:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/webyast-users-ws/webyast-users-ws.changes 2011-05-02 14:47:41.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 2 12:47:34 UTC 2011 - schubi(a)novell.com + +- adapt caching to the new job handling +- 0.2.4 + +------------------------------------------------------------------- +Tue Apr 12 13:36:33 UTC 2011 - schubi(a)novell.com + +- new caching +- 0.2.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-users-ws.spec ++++++ --- /var/tmp/diff_new_pack.T25SEi/_old 2011-05-04 10:36:47.000000000 +0200 +++ /var/tmp/diff_new_pack.T25SEi/_new 2011-05-04 10:36:47.000000000 +0200 @@ -27,7 +27,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.2 +Version: 0.2.4 Release: 1 Summary: WebYaST - users management Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/groups_controller.rb new/www/app/controllers/groups_controller.rb --- old/www/app/controllers/groups_controller.rb 2011-02-01 10:49:11.000000000 +0100 +++ new/www/app/controllers/groups_controller.rb 2011-04-11 12:49:05.000000000 +0200 @@ -71,7 +71,6 @@ Rails.logger.error "No groups found." render ErrorResult.error(404, 2, "No groups found") and return end - @groups.sort! {|x,y| x.cn <=> y.cn} respond_to do |format| format.xml { render :xml => @groups.to_xml(:root => "groups", :dasherize => false ) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/getent_passwd.rb new/www/app/models/getent_passwd.rb --- old/www/app/models/getent_passwd.rb 2011-02-01 10:49:25.000000000 +0100 +++ new/www/app/models/getent_passwd.rb 2011-04-29 18:23:25.000000000 +0200 @@ -25,28 +25,30 @@ attr_reader :full_name def self.find - result = [] - res = pure_getent - raise "cannot obtain passwd" unless res - minimum = system_minimum # RORSCAN_ITL - minimum = 1000 if minimum == 0 #fallback - lines = res.split "\n" - lines.each do |l| - elements = l.split ":" - if elements[2].to_i >= minimum && - elements[0] != "nobody" #bnc#632326 - result << GetentPasswd.new(:login => elements[0], :full_name => elements[4]) - end - end - active_directory_users = pure_wbinfo - if $? - lines = active_directory_users.split "\n" + YastCache.fetch(self) { + result = [] + res = pure_getent + raise "cannot obtain passwd" unless res + minimum = system_minimum # RORSCAN_ITL + minimum = 1000 if minimum == 0 #fallback + lines = res.split "\n" lines.each do |l| - l.chomp! - result << GetentPasswd.new(:login => l, :full_name => l) + elements = l.split ":" + if elements[2].to_i >= minimum && + elements[0] != "nobody" #bnc#632326 + result << GetentPasswd.new(:login => elements[0], :full_name => elements[4]) + end + end + active_directory_users = pure_wbinfo + if $? + lines = active_directory_users.split "\n" + lines.each do |l| + l.chomp! + result << GetentPasswd.new(:login => l, :full_name => l) + end end - end - result + result + } end private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/group.rb new/www/app/models/group.rb --- old/www/app/models/group.rb 2011-02-01 10:49:25.000000000 +0100 +++ new/www/app/models/group.rb 2011-04-29 18:23:25.000000000 +0200 @@ -62,16 +62,23 @@ public def self.find (cn) - result = group_get( "system", cn ) - result = group_get( "local", cn ) if result.empty? - return nil if result.empty? - make_group result + return find_all if cn == :all + YastCache.fetch(self, cn) { + result = group_get( "system", cn ) + result = group_get( "local", cn ) if result.empty? + return nil if result.empty? + make_group result + } end def self.find_all - result = groups_get "local" - result.update( groups_get "system") - result.collect { |k,v| make_group v } + YastCache.fetch(self, :all) { + result = groups_get "local" + result.update( groups_get "system") + result_array = [] + result.each { |k,v| result_array << make_group(v) } + result_array.sort! {|x,y| x.cn <=> y.cn} + } end def save @@ -89,15 +96,18 @@ "userlist" => ["as", members] } ) end + YastCache.reset(self, old_cn) result # result is empty string on success, error message otherwise end def destroy existing_group = Group.group_get( group_type, old_cn ) if existing_group.empty? - "" + ret = "" else - YastService.Call( "YaPI::USERS::GroupDelete", {"type" => ["s",group_type], "cn" => ["s",old_cn]}) + ret = YastService.Call( "YaPI::USERS::GroupDelete", {"type" => ["s",group_type], "cn" => ["s",old_cn]}) end + YastCache.delete(self,old_cn.inspect) + ret end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/user.rb new/www/app/models/user.rb --- old/www/app/models/user.rb 2011-02-01 10:49:11.000000000 +0100 +++ new/www/app/models/user.rb 2011-04-29 18:23:25.000000000 +0200 @@ -38,58 +38,67 @@ attr_accessor_with_default :user_password, "" attr_accessor_with_default :type, "local" +public + def initialize end # users = User.find_all def self.find_all(params={}) - attributes = [ "cn", "uidNumber", "homeDirectory", "grouplist", "uid", "loginShell", "groupname" ] - if params.has_key? "attributes" - attributes = params["attributes"].split(",") - end - users = [] - parameters = { - # how to index hash with users - "index" => ["s", "uid"], - # attributes to return for each user - "user_attributes" => [ "as", attributes ], - "type" => params["type"]||="local" - } - users_map = YastService.Call("YaPI::USERS::UsersGet", parameters) - if users_map.nil? - raise "Can't get user list" - else - users_map.each do |key, val| - user = User.new - user.load_data(val) - users << user + YastCache.fetch(self, :all) { + attributes = [ "cn", "uidNumber", "homeDirectory", "grouplist", "uid", "loginShell", "groupname" ] + if params.has_key? "attributes" + attributes = params["attributes"].split(",") end - end - users + users = [] + parameters = { + # how to index hash with users + "index" => ["s", "uid"], + # attributes to return for each user + "user_attributes" => [ "as", attributes ], + "type" => params["type"]||="local" + } + users_map = YastService.Call("YaPI::USERS::UsersGet", parameters) + if users_map.nil? + raise "Can't get user list" + else + users_map.each do |key, val| + user = User.new + user.load_data(val) + users << user + end + end + users + } end # load the attributes of the user def self.find(id) - user = User.new - parameters = { - # user to find - "uid" => [ "s", id ], - # list of attributes to return; - "user_attributes" => - [ "as", [ "cn", "uidNumber", "homeDirectory", + + return find_all if id == :all + + YastCache.fetch(self, id) { + user = User.new + parameters = { + # user to find + "uid" => [ "s", id ], + # list of attributes to return; + "user_attributes" => + [ "as", [ "cn", "uidNumber", "homeDirectory", "grouplist", "uid", "loginShell", "groupname" ] ] - } - user_map = YastService.Call("YaPI::USERS::UserGet", parameters) + } + user_map = YastService.Call("YaPI::USERS::UserGet", parameters) # system_groups = YastService.Call("YaPI::USERS::GroupsGet", {"index"=>["s","cn"],"type"=>["s","system"]}) # local_groups = YastService.Call("YaPI::USERS::GroupsGet", {"index"=>["s","cn"],"type"=>["s","local"]}) # user.allgroups = Hash[*(local_groups.keys | system_groups.keys).collect {|v| [v,1]}.flatten] - raise "Got no data while loading user attributes" if user_map.empty? + raise "Got no data while loading user attributes" if user_map.empty? - user.load_data(user_map) - user.uid = id - user + user.load_data(user_map) + user.uid = id + user + } end # User.destroy("joe") @@ -103,6 +112,7 @@ ret = YastService.Call("YaPI::USERS::UserDelete", config) Rails.logger.debug "Command returns: #{ret}" + YastCache.delete(self, uid) raise ret if not ret.blank? return (ret == "") end @@ -122,6 +132,7 @@ ret = YastService.Call("YaPI::USERS::UserModify", config, data) Rails.logger.debug "Command returns: #{ret.inspect}" + YastCache.reset(self, id) raise ret if not ret.blank? true end ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-shell for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at Wed May 4 10:32:58 CEST 2011. -------- --- GNOME/gnome-shell/gnome-shell.changes 2011-02-18 02:51:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-shell/gnome-shell.changes 2011-04-28 15:39:24.000000000 +0200 @@ -1,0 +2,343 @@ +Thu Apr 28 13:38:59 UTC 2011 - malcolmlewis(a)opensuse.org + +- Manually create %{_datadir}/gnome-shell/extensions and own it: + we don't want every extension to have to own it. + +------------------------------------------------------------------- +Wed Apr 27 15:02:06 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.1: + + Network menu: + - bgo#646395: fix problems updating the menu for mobile + broadband devices. + - bgo#646074: fix missing device descriptions with multiple + devices of the same type. + - bgo#646141: label ad-hoc neworks with an appropriate icon. + - bgo#646946: fix displaying some devices states as "invalid". + - bgo#647040: fix problems with access points that don't report + a SSID. + - Miscellaneous minor bug fixes: bgo#645981, bgo#646558, + bgo#646443, bgo#646708, bgo#646968. + + Application menu and icon: + - bgo#644122: fix bug where application menu icon was missing + at GNOME Shell startup. + - bgo#647082: fix missing application menu for dialog windows. + - bgo#646689: when launching an application through an + alternate launcher (like for a System Settings pane), + association the windows with the application, not the + launcher. + + Activities overview: + - bgo#647778: load the applications view incrementally to avoid + potentially freezing for multiple seconds. + - bgo#645801: fix bug where package installation while the + overview was up could result in a corrupted application + display. + - bgo#645990: fix dragging from the search results to launch + apps and docs. + - bgo#646019: fix flickering of selection when searching in the + overview. + - bgo#636341: fix bug when typing into the search box when text + was already selected. + + bgo#646921: fix layout of notifications for right-to-left + languages. + + bgo#648132: remove a confusing special case where Alt-Tab + sometimes switched to a different window of the same + application rather than to a different application. + + bgo#648132: fix a crash that could happen when a window was + opened on a workspace that was immediately removed. + + bgo#646740: fix keyboard navigation in logout/reboot dialogs. + + Fix missing inspector icon in Looking Glass console. + + Miscellaneous minor bug fixes: bgo#645648, bgo#646205, + bgo#646257, bgo#646855, bgo#647098, bgo#646730. +- Update default-applications.patch to use correct .desktop + filename for libreoffice. +- Drop gnome-shell-fix-gnome-bluetooth.patch: fixed upstream. + +------------------------------------------------------------------- +Thu Apr 7 08:43:28 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.0.2: + + bgo#646333: fix missing import that was preventing extensions + from loading. + + Updated translations. + +------------------------------------------------------------------- +Wed Apr 6 08:59:23 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.0.1: + + bgo#646825: fix problem with stuck event handling if network + menu pops down while user is using the scrollbar. + +------------------------------------------------------------------- +Tue Apr 5 16:19:09 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.0: + + Add shell_get_file_contents_utf8_sync(), use it instead of gio + temporarily. + + gnome-shell.css: fix multiple calendar layout issues + + network: + - fix alignment of secure vs insecure wireless icons + - fix parameters to _findConnection + - fix VPN connection state + - ignore invalid and unsupported connection types + - fix logic bug in checking whether to activate or deactive. + + end-session-dialog: Show default icon if user icon is unset + + use scrollbar in sub-menu if needed + + notificationDaemon: only ignore 'chat' and 'presence' + notifications from Empathy (bgo#645932) + + Updated translations. +- Drop 0001-src-add-more-stuff-to-gnome_shell_real_LDADD.patch: no + longer needed. + +------------------------------------------------------------------- +Tue Mar 29 08:39:21 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.91.93: + + Move GSettings schemas under /org/gnome + + Telepathy chat in message tray: + - Add proper timestamps between old messages and log messages, + gray out log messages. + - Fix duplicate messages + + Network indicator: + - Show "firmware missing" when firmware is not available + - Mark WEP/WPA wireless networks with a security icon + - Misc bug fixes + + If present, put the IBus status tray icon in the system status + area. + + Look for preferences panel destop files in gnomecc.menus not in + settings.menus. + + Change implementation of --replace so that we don't connect to + XSMP and trigger a gnome-session restart loop. + + Restore accesss to notifications associated with legacy status + icons. + + Fix badly aligned and fuzzy toggle switches in menus. + + Fix flash of Activities button when entering hot corner. + + Fix visual artifacts during message tray animations. + + Fix URL links in notifications. + + Fix positioning and animations for menus and notification + bubbles. + + Fix bug that would result in left-over application menu when no + application is active. + + Fixes to translated strings. + + Misc bug fixes. + + Build fixes + + Updated translations. +- Changes from version 2.91.92: + + New network indicator for NetworkManager 0.9. This mostly + completes replacing all legacy status icons in the status area + with native implementations. If NetworkManager 0.9 is not + found, the old nm-applet status icon will be shown in the + status area as before. + + Multi monitor improvements: + - Rewrite window positioning code to enable multi-monitor + goodness. + - Enable new Mutter feature workspaces_only_on_primary so that + workspace switching only affects the primary monitor and + windows on other monitors are unaffected. + - In the overview, show windows for each monitor on that + monitor rather than scrunching them oddly onto the primary + monitor. + - Use new "pointer barriers" feature of XFixes extension to + trap the mouse cursor at hot screen corners even when there + are adjacent monitors the cursor could slide onto. + - Don't use a slideout for the workspace selector if it's at a + monitor boundary. + + Message Tray: + - Combine multiple notifications from the same source into a + "stack" instead of filling the summary area with identical + icons. + - Queue up incoming notifications while the user is interacting + with the summary area. + - Don't show resident (permanent) notifications from apps that + are currently active. + - Improve styling of items in the message tray to make click + targets and states more obvious. + - For legacy status icons, forward clicks on the message tray + label to the icon. + - For legacy status icons, kick out of the Activies Overview + when the icon or label is clicked. + - Fix scrolling to the bottom when new messages arrive + - Misc bug fixes + + Greatly speed up search by not creating objects for + non-displayed results. + + Fix long delay on entering overview on certain AMD cards by not + repeatedly looking for the actor at pointer. + + Message Tray chat: + - Add history navigation to entry + - Handle and display aliases correctly + - Carry conversations across shell restart + - Support "actions" like the IRC /me command + - Retrieve chat history from TelepathyLogger + + When removing an empty workspace, merge it with the empty + workspace and enter the overview instead of animating to a + random adjacent workspace. + + Performance testing framework + - Use standardized window confgurations instead of whatever + windows the user has around. + - Add new performance metrics for switching to the app view and + for overview performance with different numbers of windows + open. + + Fix up StTooltip (fix bugs, add hover timeouts, and constrain + tooltips to monitors) and use to display labels on hover over + applications in the Dash. + + Allow dragging over the workspace selector during a XDND drag + to change workspaces. + + Add Restart button to shutdown dialog. + + Remove Screen Reader and Screen Keyboard from Accessibility + menu; not ready to be a prominent feature of GNOME 3.0, though + still available through System Settings. + + Honor relevant lockdown GSettings keys + + Improve appearance of PolicyKit dialogs + + Fixes for RTL layout + + Remove sliding startup indicator in favor of a fixed one + + Obey global GNOME text size setting + + Visual tweaks + + Code cleanups + + Build fixes + + Bug fixes ++++ 146 more lines (skipped) ++++ between GNOME/gnome-shell/gnome-shell.changes ++++ and /mounts/work_src_done/STABLE/gnome-shell/gnome-shell.changes calling whatdependson for head-i586 Old: ---- gnome-shell-2.91.6.tar.bz2 gnome-shell-handle-broken-glxinfo.patch gnome-shell-integrate_114.patch gnome-shell-session gnome3.desktop New: ---- default-applications.patch gnome-shell-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.Jq08TS/_old 2011-05-04 10:29:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Jq08TS/_new 2011-05-04 10:29:48.000000000 +0200 @@ -18,30 +18,25 @@ Name: gnome-shell -Version: 2.91.6 -Release: 8 -# FIXME: whenever we have GNOME3 as default desktop, remove BUILD_AGAINST_GNOME3 stuff, and gnome-shell-old-gsd.patch +Version: 3.0.1 +Release: 1 License: GPLv2+ Summary: GNOME Shell Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell Source: %{name}-%{version}.tar.bz2 -# To integrate a preview mode in GDM. -# Note: this also explains the Requires on gnome-session below. -Source1: gnome-shell-session -Source2: gnome3.desktop -# PATCH-FIX-OPENSUSE gnome-shell-integrate_114.patch vuntz(a)opensuse.org -- Fix integration with underlying packages available in openSUSE 11.4. -Patch0: gnome-shell-integrate_114.patch -# PATCH-FIX-UPSTREAM gnome-shell-handle-broken-glxinfo.patch bnc#672953 bgo#640680 vuntz(a)opensuse.org -- Fix crash on startup if glxinfo fails with a weird error -Patch1: gnome-shell-handle-broken-glxinfo.patch +Patch2: default-applications.patch BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# needed for directory ownership +BuildRequires: dbus-1 BuildRequires: pkgconfig(clutter-1.0) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gjs-1.0) +BuildRequires: pkgconfig(gnome-bluetooth-1.0) BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-0.10) @@ -51,19 +46,22 @@ BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libgnome-menu) +BuildRequires: pkgconfig(libmutter) +BuildRequires: pkgconfig(libnm-glib) >= 0.8.995 BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(mutter-plugins) +BuildRequires: pkgconfig(polkit-agent-1) +BuildRequires: pkgconfig(telepathy-glib) +BuildRequires: pkgconfig(telepathy-logger-0.2) BuildRequires: pkgconfig(xfixes) Requires: dbus-1-python Requires: gdk-pixbuf-loader-rsvg Requires: gjs Requires: gnome-icon-theme-symbolic Requires: gnome-session -%if 0%{?BUILD_AGAINST_GNOME3} # For a GSettings schema Requires: gnome-settings-daemon -%endif Requires: gsettings-desktop-schemas # mutter-devel doesn't automatically bring mutter Requires: mutter @@ -83,10 +81,9 @@ %prep %setup -q translation-update-upstream -%if ! 0%{?BUILD_AGAINST_GNOME3} -%patch0 -p1 +%if 0%{?suse_version} >= 1140 +%patch2 -p1 %endif -%patch1 -p1 %build %configure \ @@ -94,21 +91,16 @@ --libexecdir=%{_libexecdir}/%{name} \ --disable-schemas-install \ --enable-compile-warnings=no -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} V=1 %install %makeinstall find %{buildroot} -type f -name "*.la" -delete -print +# This is the directory where extensions get installed +install -d %{buildroot}%{_datadir}/gnome-shell/extensions %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file %{name} %find_gconf_schemas -# Preview mode for GNOME 3 -install -m755 %{S:1} %{buildroot}%{_libexecdir}/%{name}/ -install -d -m755 %{buildroot}%{_datadir}/xsessions -install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/ -%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome3.desktop -install -d -m755 %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart -cp %{buildroot}%{_datadir}/applications/gnome-shell.desktop %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart/ %clean rm -rf %{buildroot} @@ -131,17 +123,16 @@ %defattr(-,root,root) %doc COPYING %{_bindir}/gnome-shell +%{_bindir}/gnome-shell-extension-tool %{_libexecdir}/gnome-shell/ %if "%{_libdir}" != "%{_libexecdir}" %{_libdir}/gnome-shell/ %endif -%{_libdir}/mutter/plugins/libgnome-shell.so %{_datadir}/applications/gnome-shell.desktop -%{_datadir}/glib-2.0/schemas/org.gnome.accessibility.magnifier.gschema.xml +%{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml %{_datadir}/gnome-shell/ -%{_datadir}/xsessions/gnome3.desktop -%{_sysconfdir}/xdg/menus/gs-applications.menu +%dir %{_datadir}/gnome-shell/extensions %doc %{_mandir}/man?/gnome-shell.* %files lang -f %{name}.lang ++++++ default-applications.patch ++++++ Index: gnome-shell-2.91.91/data/org.gnome.shell.gschema.xml.in =================================================================== --- gnome-shell-2.91.91.orig/data/org.gnome.shell.gschema.xml.in +++ gnome-shell-2.91.91/data/org.gnome.shell.gschema.xml.in @@ -30,7 +30,7 @@ </_description> </key> <key name="favorite-apps" type="as"> - <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default> + <default>[ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]</default> <_summary>List of desktop file IDs for favorite applications</_summary> <_description> The applications corresponding to these identifiers ++++++ gnome-shell-2.91.6.tar.bz2 -> gnome-shell-3.0.1.tar.bz2 ++++++ ++++ 122782 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit webyast-users-ui for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package webyast-users-ui for openSUSE:Factory checked in at Wed May 4 10:27:30 CEST 2011. -------- --- webyast-users-ui/webyast-users-ui.changes 2010-08-30 12:43:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-users-ui/webyast-users-ui.changes 2011-04-14 09:18:45.000000000 +0200 @@ -1,0 +2,23 @@ +Tue Apr 12 14:43:13 UTC 2011 - schubi(a)novell.com + +- new caching +- 0.2.11 + +------------------------------------------------------------------- +Thu Mar 24 11:33:13 UTC 2011 - vlewin(a)novell.com + +- wrong dependencies in webyast-user-ui, users module should pre require webyast-base-ui >= 0.2.0 ([yast-internal] Fwd: [studio-feedback] [Feedback] Bug on my appliance: SLES 11 sp1 JeOS-fsDeployed...) +- 0.2.10 +------------------------------------------------------------------- +Fri Nov 26 10:17:07 CET 2010 - mzugec(a)suse.cz + +- accept system users (bnc#638476) +- 0.2.9 + +------------------------------------------------------------------- +Fri Nov 26 09:57:37 CET 2010 - mzugec(a)suse.cz + +- untranslated text (bnc#603782) +- 0.2.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-users-ui.spec ++++++ --- /var/tmp/diff_new_pack.sPxvIV/_old 2011-05-04 10:23:15.000000000 +0200 +++ /var/tmp/diff_new_pack.sPxvIV/_new 2011-05-04 10:23:15.000000000 +0200 @@ -23,19 +23,19 @@ Provides: yast2-webclient-users = %{version} Obsoletes: yast2-webclient-users < %{version} # updated jQuery quicksearch plugin -PreReq: yast2-webclient >= 0.1.17 +PreReq: webyast-base-ui >= 0.2.0 PreReq: webyast-users-ws >= 0.1.6 License: GPLv2 Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.7 +Version: 0.2.11 Release: 1 Summary: WebYaST - users management UI Source: www.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: rubygem-mocha rubygem-test-unit rubygem-webyast-rake-tasks webyast-base-ui-testsuite +BuildRequires: rubygem-mocha rubygem-test-unit rubygem-webyast-rake-tasks webyast-base-ui webyast-base-ui-testsuite BuildRequires: tidy # ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/groups_controller.rb new/www/app/controllers/groups_controller.rb --- old/www/app/controllers/groups_controller.rb 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/controllers/groups_controller.rb 2011-01-19 10:39:15.000000000 +0100 @@ -139,9 +139,12 @@ group.members_string = group.members.join(",") end @all_users_string = "" + @all_sys_users_string = "" @users = [] + @sys_users = [] if @permissions[:usersget] == true @users = User.find(:all, :params => { :attributes => "uid"}) + @sys_users = User.find( :all, :params=> { "attributes"=>"cn,uidNumber,uid", "type"=>"system", "index"=>["s", "uid"]} ) end @users.each do |user| if @all_users_string.blank? @@ -151,6 +154,14 @@ end end + @sys_users.each do |user| + if @all_sys_users_string.blank? + @all_sys_users_string = user.uid + else + @all_sys_users_string += ",#{user.uid}" + end + end + rescue ActiveResource::ResourceNotFound => e flash[:error] = _("Cannot read groups list.") return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/users_controller.rb new/www/app/controllers/users_controller.rb --- old/www/app/controllers/users_controller.rb 2010-08-04 16:42:28.000000000 +0200 +++ new/www/app/controllers/users_controller.rb 2011-04-12 11:29:23.000000000 +0200 @@ -66,7 +66,14 @@ return roles end - +def all_users + all_users_list = [] + all_users = User.find :all + all_users.each do |user| + all_users_list.push(user.uid) + end + all_users_list.join(",") +end public def initialize end @@ -166,6 +173,9 @@ all_roles.push(role.name) end @all_roles_string = all_roles.join(",") + + @all_users_string = all_users + @groups = [] if @permissions[:groupsget] == true @groups = Group.find :all @@ -251,6 +261,7 @@ :type => "local" ) @user.grp_string = dummy.grp_string + @all_users_string = all_users response = true begin @@ -298,18 +309,14 @@ save_roles((a)user.id,params["user"]["roles_string"]) end - response = true begin - response = @user.save - rescue ActiveResource::ClientError => e - flash[:error] = YaST::ServiceResource.error(e) - response = false - end - if response - flash[:notice] = _("User <i>%s</i> was successfully updated.") % @user.uid + if @user.save + flash[:notice] = _("User <i>%s</i> was successfully updated.") % @user.uid + redirect_to :action => "index" + end + rescue ActiveResource::ClientError => e + flash[:error] = YaST::ServiceResource.error(e) redirect_to :action => "index" - else - render :action => "edit" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/groups/index.html.erb new/www/app/views/groups/index.html.erb --- old/www/app/views/groups/index.html.erb 2010-08-25 12:06:17.000000000 +0200 +++ new/www/app/views/groups/index.html.erb 2011-04-12 13:05:56.000000000 +0200 @@ -1,4 +1,4 @@ - <% if JSMIN == true %> - <%= javascript_include_tag "users-min.js"-%> + <%= javascript_include_tag "min/users-min.js"-%> <% else %> <%= javascript_include_tag "users.js" %> <%= javascript_include_tag "select_dialog.js" %> @@ -88,7 +88,7 @@ <% disabled = ! ((@permissions[:groupadd] && @adding) || (@permissions[:groupmodify] && !@adding)) %> <div class='plugin-icon'><img alt="yast-groups" src='/icons/yast-groups.png' alt="groups module"/> - <%=_("Groups") + header_spacer %> + <%=_("Groups") + header_spacer %><span id="questionMark">?</span> <%= _("Add new group") %> </div> @@ -136,4 +136,5 @@ <% end %> <div><input type="hidden" id="all_users_string" value="<%= @all_users_string %>" /></div> + <div><input type="hidden" id="system_users_string" value="<%= @all_sys_users_string %>" /></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/users/_user_form.erb new/www/app/views/users/_user_form.erb --- old/www/app/views/users/_user_form.erb 2010-08-17 13:53:02.000000000 +0200 +++ new/www/app/views/users/_user_form.erb 2011-04-12 11:29:23.000000000 +0200 @@ -32,8 +32,10 @@ <tr><td> <div class="label"><%=_("Login Name")%></div> - </td><td colspan=2> - <%= f.text_field :uid, :disabled => disabled, :onblur => "$('#form_"+ (new ? "" : user.uid) +"').validate().element('#user_uid');", :class => "required" %> + </td><td> + <%= f.text_field :uid, :disabled => disabled, :onblur => "$('#form_"+ (new ? "" : user.uid) +"').validate().element('#user_uid');", :onkeyup => "user_exists_validation(this);", :class => "required" %> + </td><td> + <label id="user_name-error" class="error" style="display:none"><%= _('User already exists.') %></label> <%= f.hidden_field :id %> </td></tr> @@ -72,7 +74,7 @@ <% end %> </td> <td> - <label id="groups-error" class="error">error</label> + <label id="groups-error" class="error"></label> </td> </tr> <tr> @@ -91,7 +93,7 @@ <% end %> </td> <td> - <label id="def-group-error" class="error">error</label> + <label id="def-group-error" class="error"></label> </td> </tr> </table> @@ -135,7 +137,7 @@ %> </td> <td> - <label id="roles-error" class="error">error</label> + <label id="roles-error" class="error"></label> </td> </tr> </table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/users/index.html.erb new/www/app/views/users/index.html.erb --- old/www/app/views/users/index.html.erb 2010-08-25 12:06:17.000000000 +0200 +++ new/www/app/views/users/index.html.erb 2011-04-12 13:05:56.000000000 +0200 @@ -21,10 +21,11 @@ <% content_for :head do %> <% if JSMIN == true %> - <%= javascript_include_tag "users-min.js"-%> + <%= javascript_include_tag "/min/users-min.js"-%> + <%= javascript_include_tag "select_dialog.js" %> <% else %> - <%= javascript_include_tag "jquery.quicksearch.js"-%> <%= javascript_include_tag "select_dialog.js" %> + <%= javascript_include_tag "jquery.quicksearch.js"-%> <%= javascript_include_tag "users.js" %> <% end %> @@ -59,6 +60,9 @@ </style> <% javascript_tag do %> + var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>"); + startNotifier({'module':'users', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); + jQuery.expr[':'].Contains = function(a, i, m) { return jQuery(a).text().toUpperCase().indexOf(m[3].toUpperCase()) >= 0; }; @@ -185,7 +189,7 @@ <% end %> <% end %> -<div class='plugin-icon'><img alt="yast-users" src='/icons/yast-users.png'/><%=_("Users")%></div> +<div class='plugin-icon'><img alt="yast-users" src='/icons/yast-users.png'/><%=_("Users")%><span id="questionMark">?</span></div> <div class="plugin-content"> <div id="search-userbar"> @@ -205,7 +209,7 @@ <div id="link-container"> <div id="action_links" class="action_links"> <% if @permissions[:useradd] %> - <%=link_to image_tag("/icons/yast-users.png", :class=>"icons") + _("Add New User"), :action => :new %> + <%=link_to image_tag("/icons/yast-users.png", :class=>"icons") + _("New User"), :action => :new %> <label>|</label> <% end %> <%=link_to image_tag("/icons/yast-groups.png", :class=>"icons") + _("Manage Groups"), :controller => "groups" %> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/users/new.html.erb new/www/app/views/users/new.html.erb --- old/www/app/views/users/new.html.erb 2010-08-25 12:06:17.000000000 +0200 +++ new/www/app/views/users/new.html.erb 2011-04-12 11:29:23.000000000 +0200 @@ -20,7 +20,7 @@ --> <% content_for :head do %> <% if JSMIN == true %> - <%= javascript_include_tag "users-min"-%> + <%= javascript_include_tag "min/users-min" -%> <% else %> <%= javascript_include_tag "users.js" %> <%= javascript_include_tag "select_dialog.js" %> @@ -69,7 +69,6 @@ </style> <script language='javascript'> - function select_groups_dialog() { var open_dialog = select_many_dialog({ kind : 'groups', @@ -126,7 +125,6 @@ }; $(document).ready(function(){ - select_groups_open = select_groups_dialog(); select_default_group_open = select_default_group_dialog(); select_roles_open = select_roles_dialog(); @@ -213,4 +211,5 @@ <% end %> <div><input type="hidden" id="all_grps_string" value="<%= @all_grps_string %>" /></div> <div><input type="hidden" id="all_roles_string" value="<%= @all_roles_string %>" /></div> + <div><input type="hidden" id="all_users_string" value="<%= @all_users_string %>" /></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/lib/tasks/jsmin.rake new/www/lib/tasks/jsmin.rake --- old/www/lib/tasks/jsmin.rake 2010-08-23 14:32:04.000000000 +0200 +++ new/www/lib/tasks/jsmin.rake 2011-04-12 11:29:23.000000000 +0200 @@ -30,16 +30,17 @@ end namespace :js do - javascripts = ['select_dialog.js', 'excanvas.js'] + javascripts = ['select_dialog.js', 'jquery.quicksearch.js', 'excanvas.js', 'users.js'] Dir.chdir(File.join(RAILS_ROOT, 'public', 'javascripts')) do javascripts.map! {|f| File.join(Dir.pwd, f)} #users.js stored in the plugin folder!!! - javascripts.push(File.join(File.dirname(__FILE__), '/../../public/javascripts/users.js')) + #javascripts.push(File.join(File.dirname(__FILE__), '/../../public/javascripts/users.js')) file 'users-min.js' => javascripts do | f | - output_file = File.join(File.dirname(__FILE__), '/../../public/javascripts/') + f.name - minify(f.prerequisites, output_file) + $dir = File.join(File.dirname(__FILE__), '/../../public/javascripts/min/') + mkpath($dir); + minify(f.prerequisites, $dir + f.name) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/public/javascripts/users.js new/www/public/javascripts/users.js --- old/www/public/javascripts/users.js 2010-08-17 13:53:02.000000000 +0200 +++ new/www/public/javascripts/users.js 1970-01-01 01:00:00.000000000 +0100 @@ -1,203 +0,0 @@ -/* -# Copyright (c) 2009-2010 Novell, Inc. -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License -# as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -*/ - -// using replace instead of trim() see bnc#580561 -function _trim(word){ - return word.replace(/^\s*|\s*$/g,''); -} - -function _getElementsByClassName(node, classname) { - if(!node) node = document.getElementsByTagName("body")[0]; - var a = []; - var re = new RegExp('\\b' + classname + '\\b'); - var els = node.getElementsByTagName("*"); - for(var i=0,j=els.length; i<j; i++) - if(re.test(els[i].className))a.push(els[i]); - return a; -} - - - - // onsubmit handler - function form_handler(sid, message) { - if ($('#form_' + sid).valid()) - { -// disable_forms(); -// $('#progress_' + sid).show(); -// blockForm('form_'+sid, message); - - return true; - } - else - { - return false; - } - } - -// delete button handler -function delete_handler(which, progress, message){ - if (which.childElementCount == 2 && which.children[0].firstChild.textContent == "Delete"){ - which.childNodes[0].onclick="return false;"; - which.childNodes[0].href=""; - - disableFormOnSubmit(message); - } -} - -function members_validation(which){ - var mygroups = []; - if (_trim(which.value).length>0) mygroups = which.value.split(","); - var allgroups = $("#all_users_string")[0].value.split(","); - errmsg=""; - for (i=0;i<mygroups.length;i++){ - var found=false; - for(a=0;a<allgroups.length;a++){ - if (allgroups[a]==_trim(mygroups[i])) found=true; - } - if (!found){ - errmsg = mygroups[i]+" "+"is not valid user!" ; - } - } - _getElementsByClassName(which.parentNode.parentNode, 'error')[0].innerHTML = errmsg; - _getElementsByClassName(which.parentNode.parentNode, 'error')[0].style.display= (errmsg.length==0) ? "none" : "block"; - return (errmsg.length==0); -} - - -function set_tab_focus(tab){ - $("#accordion").accordion('activate',$("#tab_"+tab).children("legend")); -} - - -function findById(where, id){ - var node=null; - for(var i=0;i<where.length;i++){ - if (where[i].id==id) node=where[i]; - } - return node; -} - - -function groups_validation(which){ - var mygroups = _trim(findById(which.parentNode.getElementsByTagName('input'), "user_grp_string").value); - if (mygroups.length>0) mygroups = mygroups.split(","); - var allgroups = $("#all_grps_string")[0].value.split(","); - errmsg=""; - for (i=0;i<mygroups.length;i++){ - var found=false; - for(a=0;a<allgroups.length;a++){ - if (allgroups[a]==_trim(mygroups[i])) found=true; - } - if (!found){ - errmsg = mygroups[i]+" "+"is not valid group!" ; - } - } - set_tab_focus("groups") - var error = findById(which.parentNode.parentNode.parentNode.getElementsByTagName('label'), "groups-error"); - error.innerHTML = errmsg; - error.style.display= (errmsg.length==0) ? "none" : "block"; - return (errmsg.length==0); -} - -function def_group_validation(which){ - var mygroup = _trim(findById(which.parentNode.getElementsByTagName('input'), "user_groupname").value); - var allgroups = $("#all_grps_string")[0].value.split(","); - errmsg=""; - - if (mygroup.length>0){ - var found=false; - for(a=0;a<allgroups.length;a++){ - if (allgroups[a]==_trim(mygroup)) found=true; - } - if (!found){ - errmsg = mygroup+" "+"is not valid group!" ; - } - } - - set_tab_focus("groups") - var error = findById(which.parentNode.parentNode.parentNode.getElementsByTagName('label'), "def-group-error"); - error.innerHTML = errmsg; - error.style.display= (errmsg.length==0) ? "none" : "block"; - return (errmsg.length==0); -} - -function roles_validation(which){ - var myroles = _trim(findById(which.parentNode.getElementsByTagName('input'), "user_roles_string").value); - if (myroles.length>0) myroles = myroles.split(","); - var allroles = $("#all_roles_string")[0].value.split(","); - errmsg=""; - for (i=0;i<myroles.length;i++){ - var found=false; - for(a=0;a<allroles.length;a++){ - if (allroles[a]==_trim(myroles[i])) found=true; - } - if (!found){ - errmsg = myroles[i]+" "+"is not valid role!" ; - } - } - set_tab_focus("roles") - var error = findById(which.parentNode.parentNode.parentNode.getElementsByTagName('label'), "roles-error"); - error.innerHTML = errmsg; - error.style.display= (errmsg.length==0) ? "none" : "block"; - return (errmsg.length==0); -} - -function user_validation(which, username){ - var valid = true; - var form = '#form_'+username; - if (valid && ($(form).validate().element(form+' #user_uid')==false || $(form).validate().element(form+' #user_user_password')==false || $(form).validate().element(form+' #user_user_password2')==false)){ - $(".tabs_"+username).tabs('select',"#tab_login_"+username); - valid = false; - } - if (valid && (groups_validation($(form+' #user_grp_string')[0])==false || def_group_validation($(form+' #user_groupname')[0])==false)){ - $(".tabs_"+username).tabs('select',"#tab_groups_"+username); - valid = false; - } - if (valid && $(form).validate().element(form+' #user_uid_number')==false){ - $(".tabs_"+username).tabs('select',"#tab_advanced_"+username); - valid = false; - } - - return valid; - -} - - -function propose_home(which){ - var login = findById(which.parentNode.getElementsByTagName('input'), "user_uid").value; - var home = findById(which.parentNode.getElementsByTagName('input'), "user_home_directory").value; - - home = "/home/"+login; - - if (login.length>0) findById(which.parentNode.getElementsByTagName('input'), "user_home_directory").value = home; -} - -function propose_login(which){ - var fullname = findById(which.parentNode.getElementsByTagName('input'), "user_cn").value; - var login = findById(which.parentNode.getElementsByTagName('input'), "user_uid").value; - - if (login.length==0){ - login = fullname.replace(/\s/g, '').toLowerCase(); - findById(which.parentNode.getElementsByTagName('input'), "user_uid").value = login; - propose_home(which.parentNode.parentNode.parentNode); - } -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/test/functional/groups_controller_test.rb new/www/test/functional/groups_controller_test.rb --- old/www/test/functional/groups_controller_test.rb 2010-08-02 09:15:09.000000000 +0200 +++ new/www/test/functional/groups_controller_test.rb 2011-01-19 10:39:15.000000000 +0100 @@ -47,6 +47,7 @@ mock.delete "/groups/users.xml", header, nil, 200 mock.put "/groups/users.xml", header, nil, 200 mock.get "/users.xml?attributes=uid", header, response_users, 200 + mock.get "/users.xml?attributes=cn,uidNumber,id&index=s,uid", header, nil, 200 end end ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gdl for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package gdl for openSUSE:Factory checked in at Wed May 4 10:22:52 CEST 2011. -------- --- GNOME/gdl/gdl.changes 2011-03-21 17:58:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/gdl/gdl.changes 2011-04-27 15:18:32.000000000 +0200 @@ -1,0 +2,50 @@ +Wed Apr 27 13:16:25 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.1: + + Set GtkJunctionSides for GdlSwitcher toggle buttons. + + Updated translations. + +------------------------------------------------------------------- +Tue Apr 5 17:34:44 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.0: + + Fix missing return values + + Updated translations. +- Changes from version 2.91.92: + + Build fixes + + Translation updates +- Changes from version 2.91.90: + + Translation updates +- Changes from version 2.91.4: + + Fixed for latest gtk+ +- Changes from version 2.91.3: + + GIR build fixed for vala + + Use gtk_paned_new instead() of gtk_[h,v]paned_new() +- Changes from version 2.91.2: + + bgo#633499: prepare for the demise of size_request + + Some smaller fixes for leftovers of the gtk+-3.0 transition +- Changes from version 2.91.1: + + Ported to lastest gtk+ master: + - bgo#633049: Stop using GtkObject + - bgo#630841: Don't use deprecated GDK drawing APIs + - bgo#631070: Use upstream gettext instead the Glib one + - bgo#624636: Update to new GtkNotebook switch-page signal + signature. + + Due to new drawing API we have much nicer preview windows now. +- Changes from version 2.90.0: + + Depends on gtk+-3.0 now: + - new library name libgdl3 + - new pkg-config name gdl-3.0 +- Drop gdl-build-fix.patch: fixed upstream. +- Update library package name to follow library soname change. +- Change gtk2-devel BuildRequires to gtk3-devel. +- Add gobject-introspection-devel BuildRequires to build + introspection support. +- Remove explicit Requires of gtk2-devel and libxml2-devel in devel + subpackage: they will automatically be added the pkgconfig() way. +- Remove Obsoletes for libgdl-1-0 as this is not needed anymore + with the soname change. +- Remove Provides/Obsoletes for gdl-doc as this was long enough + ago. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gdl-2.30.1.tar.bz2 gdl-build-fix.patch New: ---- gdl-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdl.spec ++++++ --- /var/tmp/diff_new_pack.Fy27Vu/_old 2011-05-04 10:16:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Fy27Vu/_new 2011-05-04 10:16:34.000000000 +0200 @@ -20,19 +20,18 @@ Name: gdl BuildRequires: fdupes -BuildRequires: gtk2-devel +BuildRequires: gobject-introspection-devel +BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: libxml2-devel BuildRequires: translation-update-upstream License: LGPLv2.1+ Group: System/Libraries -Version: 2.30.1 -Release: 5 +Version: 3.0.1 +Release: 1 Summary: Gnome Devtool Libraries contains components and libraries Source: http://ftp.gnome.org/pub/GNOME/sources/gdl/2.24/%name-%version.tar.bz2 Source1: %{name}-rpmlintrc -# PATCH-FIX-UPSTREAM gdl-build-fix.patch bgo603600 vuntz(a)opensuse.org -- Missing return values -Patch0: gdl-build-fix.patch Url: http://ftp.gnome.org/pub/GNOME/sources/gdl/0.7/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,16 +40,15 @@ intended to be shared between GNOME development tools, including gnome-debug, gnome-build, and anjuta2. -%package -n libgdl-1-3 +%package -n libgdl-3-1 License: LGPLv2.1+ Summary: Gnome Devtool Libraries contains components and libraries Group: System/Libraries Requires: %{name}-lang = %{version} Obsoletes: gdl < %{version} Provides: gdl = %{version} -Obsoletes: libgdl-1-0 < 2.27.2 -%description -n libgdl-1-3 +%description -n libgdl-3-1 Gnome Devtool Libraries contains components and libraries that are intended to be shared between GNOME development tools, including gnome-debug, gnome-build, and anjuta2. @@ -59,10 +57,7 @@ License: LGPLv2.1+ Summary: Gnome Devtool Libraries contains components and libraries Group: System/Libraries -Requires: libgdl-1-3 = %{version} -Requires: gtk2-devel libxml2-devel -Obsoletes: gdl-doc < 2.24.0 -Provides: gdl-doc = 2.24.0 +Requires: libgdl-3-1 = %{version} %description devel Gnome Devtool Libraries contains components and libraries that are @@ -73,44 +68,42 @@ %prep %setup -q translation-update-upstream -%patch0 -p1 %build %configure -make %{?jobs:-j%jobs} +make %{?jobs:-j%jobs} V=1 %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif rm $RPM_BUILD_ROOT/%{_libdir}/*.la -%find_lang %{name}-1 +%find_lang %{name}-3 %fdupes -s $RPM_BUILD_ROOT -%post -n libgdl-1-3 -p /sbin/ldconfig +%post -n libgdl-3-1 -p /sbin/ldconfig -%postun -n libgdl-1-3 -p /sbin/ldconfig +%postun -n libgdl-3-1 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files -n libgdl-1-3 +%files -n libgdl-3-1 %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%{_datadir}/gdl +%{_datadir}/gdl-3 %{_libdir}/*.so.* +%{_libdir}/girepository-1.0/Gdl-3.typelib %files devel %defattr(-, root, root) %{_includedir}/libgdl* %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so +%{_datadir}/gir-1.0/Gdl-3.gir # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/* -%files lang -f %{name}-1.lang +%files lang -f %{name}-3.lang %changelog ++++++ gdl-2.30.1.tar.bz2 -> gdl-3.0.1.tar.bz2 ++++++ ++++ 71864 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dhcp for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at Wed May 4 10:16:24 CEST 2011. -------- --- dhcp/dhcp.changes 2011-04-29 15:49:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2011-05-03 14:28:14.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 3 12:27:08 UTC 2011 - mt(a)suse.de + +- Fixed dhclient-script typo causing ISC DHCPv6 client to execute + ifup pre-down scripts also while renew, when the ipv6 address + did not changed (bnc#690859). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.DiZIGW/_old 2011-05-04 10:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.DiZIGW/_new 2011-05-04 10:15:28.000000000 +0200 @@ -36,7 +36,7 @@ Group: Productivity/Networking/Boot/Servers AutoReqProv: on Version: 4.2.1.P1 -Release: 1 +Release: 3 Summary: Common Files Used by ISC DHCP Software Url: http://www.isc.org/software/dhcp Source0: dhcp-%{isc_version}.tar.bz2 ++++++ dhclient-script ++++++ --- /var/tmp/diff_new_pack.DiZIGW/_old 2011-05-04 10:15:29.000000000 +0200 +++ /var/tmp/diff_new_pack.DiZIGW/_new 2011-05-04 10:15:29.000000000 +0200 @@ -580,7 +580,7 @@ fi netconfig_modify - if [ x$old_ip6_address != x -a x$old_ip6_address != x$new_ip_address ]; + if [ x$old_ip6_address != x -a x$old_ip6_address != x$new_ip6_address ]; then if is_ifup_controlled ; then /sbin/ifdown $interface -o dhcp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-session for openSUSE:Factory
by root＠hilbert.suse.de 04 May '11

04 May '11

Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at Wed May 4 10:14:06 CEST 2011. -------- --- GNOME/gnome-session/gnome-session.changes 2011-02-21 18:13:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2011-04-27 14:48:11.000000000 +0200 @@ -1,0 +2,119 @@ +Wed Apr 27 12:43:38 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.1: + + Updated translations. + +------------------------------------------------------------------- +Tue Apr 5 15:56:28 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.0: + + Session Manager: + - Change path of GSettings schema + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 29 09:01:59 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.91.94: + + Session Manager: Bump the phase timeout to 30 seconds + + Updated translations. +- Changes from version 2.91.93: + + Session Manager: + - Make work with latest version of the shell. +- Changes from version 2.91.92: + + Session Manager: + - Better fatal error handling in general, including specific + handling when required components fail. + - Improve wording of fallback dialog. + - Avoid double-checking between gdm and gnome-session in + gnome-session-check-accelerated-helper. + - Switch to using seconds for idle time. + - Honor disable-log-out and disable-user-switching lockdown + settings. + - Change format of .session files in a incompatible way; this + is now documented in the gnome-session man page. + - Update gnome-session-quit man page + - Enforce the use of required components in the session. + - Deal with conflicts between Provides in different + applications by only having one provider running; this was + only working well for Provides defined in the session + definition. + - Use app-id when saving session instead of startup-id for + .desktop. + - Explicitly require gnome-shell/gnome-panel in .session files, + instead of using providers. + - Clean up saved session on logout if session is not getting + saved. + - Use "computer-fail" icon from theme instead of our own + sad-computer. + - Fix some gnome-shell/gnome-session interaction issue on + logout, when a third application cancels logout. + - Code cleanups +- Changes from version 2.91.91.3: + + Session Manager: + - Better error message on not-found session. + - Rename gnome-session-save to gnome-session-quit. + - Fix cancel button in logout dialog. + - Increase is-accelerated runnable helper timeout. + - Fix crash when if-session autostart condition is used. + - Add gnome-session-check-accelerated to set a X property about + acceleration + - Rename gnome-session-is-accelerated to + gnome-session-check-accelerated-helper. +- Drop gnome-session-fix-autostart.patch: fixed upstream. +- Disable gnome-session-bgo507101-tile-ui.patch for now: it needs + to be rebased. + +------------------------------------------------------------------- +Tue Mar 1 08:18:52 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.91.90.1: + + Session Manager: + - Fix a crash happening in gdm + + Updated translations. +- Changes from version 2.91.90: + + Session Manager: + - Update for GSettings schemas changes + - Read default session from GSettings + - Make the current session name available via dbus + - Support autostart conditions that depend on the current + session + - Make notification-daemon a required part of the fallback + session + - Show a dialog after login the first time we fall back to + gnome-fallback + - Various fixes to shell logout/shutdown dialog + - Code cleanups + + Misc: + - gsettings-desktop-schemas 0.1.7 is required + + Updated translations. +- Changes from version 2.91.6: + + Session Manager: + - Fix build with latest GTK+ 3 + - Migrate to GSettings + - Add support for shell logout/shutdown dialog + - Use fallback session if required components are missing + + Defined Sessions: + - Do not consider Gallium's softpipe and llvmpipe as + accelerated + - Do not run nautilus by default + + Capplet: + - Migrate to GSettings + + Misc: + - Change GETTEXT_PACKAGE to gnome-session-3.0 + - Drop gnome-wm script + - Add a runtime dependency on gsettings-desktop-schemas + + Updated sranslations. +- Add pkgconfig(librsvg-2.0) BuildRequires. +- Add notification-daemon Requires to main package as it's now + required by the fallback session. +- Add gnome-session-fix-autostart.patch: fix crash in autostart + code, taken from git. +- Add gsettings-desktop-schemas Requires to gnome-session-core. +- Remove --with-default-wm=gnome-wm and --enable-splash configure + options: they're now gone. +- Drop gnome-session-enable-disable-compiz.patch: this should now + be done another way, with fallback modes in gnome-session. See + bnc#676360. + +------------------------------------------------------------------- @@ -29,0 +149,46 @@ + +------------------------------------------------------------------- +Thu Dec 23 16:04:46 CET 2010 - vuntz(a)opensuse.org + +- Update to version 2.91.4: + + Session Manager: + - Add autostart condition through GSettings + - Don't ever show inhibitor dialog if logout is forced + - Fix some issue tracking clients on logout + - Add an application restart limit + - Move the definition of a session from gconf to .desktop-like + files + - Change default session to use GNOME Shell, with a fallback to + classic GNOME + - Update for GTK+ 3 changes + - Code cleanups + + Capplet: + - Set NoDisplay=true + - Fix inline search + - Update for GTK+ 3 changes + + Updated translations. +- Add pkgconfig(xcomposite) and pkgconfig(gl) BuildRequires, for + the new gnome-session-is-accelerated helper. + +------------------------------------------------------------------- +Fri Dec 17 13:43:32 CET 2010 - vuntz(a)opensuse.org + +- Update to version 2.91.0: + + Session Manager: + - Miscellaneous string fixes + - Fix for GTK+ 3 changes + + Misc: + - Update information in README and other files + - Update man pages + - Build against GTK+ 3 by default + - Rename --enable-deprecations configure flag to + --enable-deprecation-flags + + Updated translations. +- Move to pkgconfig()-style BuildRequires: + + Old ones: gconf2-devel, libupower-glib-devel. + + New ones: dbus-glib-1, gconf-2.0, glib-2.0, gtk+-3.0, ice, sm, + upower-glib, xau, xext, xrender, xtst. +- Remove gnome-settings-daemon-devel BuildRequires: it's not + needed. +- Improve summary and description. +- Rework gnome-session-bgo507101-tile-ui.patch to build with GTK+3. calling whatdependson for head-i586 Old: ---- gnome-session-2.32.1.tar.bz2 gnome-session-enable-disable-compiz.patch New: ---- gnome-session-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.DU9z80/_old 2011-05-04 10:08:22.000000000 +0200 +++ /var/tmp/diff_new_pack.DU9z80/_new 2011-05-04 10:08:22.000000000 +0200 @@ -18,8 +18,8 @@ Name: gnome-session -Version: 2.32.1 -Release: 7 +Version: 3.0.1 +Release: 1 License: GPLv2+ Summary: Session Tools for the GNOME Desktop Url: http://www.gnome.org @@ -35,22 +35,31 @@ Patch1: gnome-session-kdm-support.patch # PATCH-NEEDS-REBASE gnome-session-wm-switch.patch bnc180506 danw(a)novell.com -- Fixes legacy sessions to use gnome-wm instead of metacity/compiz. Legacy sessions are not really supported anymore -- do we need to handle a similar case for current saved sessions, though? (was PATCH-FIX-OPENSUSE) Patch2: gnome-session-wm-switch.patch -# PATCH-FIX-UPSTREAM gnome-session-bgo507101-tile-ui.patch bgo507101 vuntz(a)novell.com -- Tile UI for logout dialog. +# PATCH-NEEDS-REBASE gnome-session-bgo507101-tile-ui.patch bgo507101 vuntz(a)novell.com -- Tile UI for logout dialog. (Was: PATCH-FIX-UPSTREAM) Patch3: gnome-session-bgo507101-tile-ui.patch -# PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz(a)novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm -Patch4: gnome-session-enable-disable-compiz.patch BuildRequires: fdupes BuildRequires: gconf-sanity-check -BuildRequires: gconf2-devel BuildRequires: gnome-common BuildRequires: gnome-patch-translation -BuildRequires: gnome-settings-daemon-devel BuildRequires: hicolor-icon-theme BuildRequires: intltool -BuildRequires: libupower-glib-devel BuildRequires: tcpd-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(upower-glib) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xtst) Requires: %{name}-core = %{version} # Programs that are in the default session (we use Requires since Recommends # might make it possible for some people to get an empty gnome-session, and @@ -59,6 +68,7 @@ Requires: gnome-settings-daemon Requires: metacity Requires: nautilus +Requires: notification-daemon Recommends: %{name}-lang Obsoletes: gnome-core # There's no splash anymore, so no branding package. @@ -79,8 +89,9 @@ Requires: ConsoleKit Requires: dbus-1-x11 Requires: gconf-sanity-check +Requires: gsettings-desktop-schemas >= 0.1.7 Requires: hicolor-icon-theme -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description core This packages contain a minimal version of gnome-session, that can be used for @@ -91,21 +102,20 @@ %prep %setup -q translation-update-upstream -gnome-patch-translation-prepare +# disabled unless patches 2 or 3 are enabled +# gnome-patch-translation-prepare %patch0 -p1 %patch1 -p1 # needs-rebase #%patch2 -p1 -%patch3 -p0 -%patch4 -p1 -gnome-patch-translation-update +# needs-rebase +#%patch3 -p0 +# gnome-patch-translation-update %build NOCONFIGURE=1 gnome-autogen.sh -%configure \ - --with-default-wm=gnome-wm \ - --enable-splash -%__make %{?jobs:-j%jobs} +%configure +%__make %{?jobs:-j%jobs} V=1 %install %makeinstall @@ -122,11 +132,9 @@ install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -%suse_update_desktop_file gnome-wm %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop -%find_lang %{name}-2.0 %{?no_lang_C} -%find_gconf_schemas +%find_lang %{name}-3.0 %{?no_lang_C} %fdupes %{buildroot} %clean @@ -140,22 +148,17 @@ %desktop_database_postun %icon_theme_cache_postun -%pre core -f %{name}.schemas_pre - %post core +%glib2_gsettings_schema_post %icon_theme_cache_post -%posttrans core -f %{name}.schemas_posttrans - -%preun core -f %{name}.schemas_preun - %postun core +%glib2_gsettings_schema_postun %icon_theme_cache_postun %files %defattr (-, root, root) %{_bindir}/gnome -%{_bindir}/gnome-wm %{_bindir}/gnome-session-properties %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop @@ -163,19 +166,27 @@ %exclude %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg %{_datadir}/gnome-session/session-properties.ui %doc %{_mandir}/man1/gnome-session-properties.1* -%doc %{_mandir}/man1/gnome-wm.1* +# Defined sessions (for GNOME only) +%{_datadir}/gnome-session/sessions/gnome-fallback.session +%{_datadir}/gnome-session/sessions/gnome.session +# Helper for the defined sessions +%{_libexecdir}/gnome-session-check-accelerated +%{_libexecdir}/gnome-session-check-accelerated-helper -%files core -f %{name}.schemas_list +%files core %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/gnome-session -%{_bindir}/gnome-session-save +%{_bindir}/gnome-session-quit +%{_datadir}/GConf/gsettings/gnome-session.convert +%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml %dir %{_datadir}/gnome-session +%dir %{_datadir}/gnome-session/sessions %{_datadir}/gnome-session/gsm-inhibit-dialog.ui %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg %doc %{_mandir}/man1/gnome-session.1* -%doc %{_mandir}/man1/gnome-session-save.1* +%doc %{_mandir}/man1/gnome-session-quit.1* -%files lang -f %{name}-2.0.lang +%files lang -f %{name}-3.0.lang %changelog ++++++ gnome-session-2.32.1.tar.bz2 -> gnome-session-3.0.1.tar.bz2 ++++++ ++++ 61459 lines of diff (skipped) ++++++ gnome-session-bgo507101-tile-ui.patch ++++++ --- /var/tmp/diff_new_pack.DU9z80/_old 2011-05-04 10:08:22.000000000 +0200 +++ /var/tmp/diff_new_pack.DU9z80/_new 2011-05-04 10:08:22.000000000 +0200 @@ -2,9 +2,9 @@ =================================================================== --- gnome-session/gsm-manager.c.orig +++ gnome-session/gsm-manager.c -@@ -2804,7 +2804,8 @@ logout_dialog_response (GsmLogoutDialog - { - g_debug ("GsmManager: Logout dialog response: %d", response_id); +@@ -2836,7 +2836,8 @@ logout_dialog_response (GsmLogoutDialog + + display = gtk_widget_get_display (GTK_WIDGET (logout_dialog)); - gtk_widget_destroy (GTK_WIDGET (logout_dialog)); + if (response_id != GTK_RESPONSE_HELP) @@ -12,7 +12,7 @@ /* In case of dialog cancel, switch user, hibernate and * suspend, we just perform the respective action and return, -@@ -2814,6 +2815,10 @@ logout_dialog_response (GsmLogoutDialog +@@ -2846,6 +2847,10 @@ logout_dialog_response (GsmLogoutDialog case GTK_RESPONSE_NONE: case GTK_RESPONSE_DELETE_EVENT: break; @@ -21,7 +21,7 @@ + "gosgetstarted-73"); + break; case GSM_LOGOUT_RESPONSE_SWITCH_USER: - request_switch_user (manager); + request_switch_user (display, manager); break; Index: gnome-session/gsm-util.c =================================================================== @@ -35,7 +35,7 @@ #include <sys/types.h> #include <unistd.h> #include <sys/time.h> -@@ -503,3 +504,75 @@ gsm_util_setenv (const char *variable, +@@ -503,3 +504,86 @@ gsm_util_setenv (const char *variable, g_error_free (bus_error); } } @@ -45,10 +45,8 @@ + const char *link_id) +{ + GError *error = NULL; -+ char *command; + const char *lang; + char *uri = NULL; -+ GdkScreen *gscreen; + gboolean found; + + int i; @@ -77,16 +75,30 @@ + } + + if (found) { ++ GAppInfo *app_info; ++ char *command; ++ + if (link_id) { + command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL); + } else { + command = g_strconcat ("gnome-open ghelp://", uri, NULL); + } + -+ gscreen = gdk_screen_get_default (); -+ gdk_spawn_command_line_on_screen (gscreen, command, &error); -+ } else -+ command = NULL; ++ app_info = g_app_info_create_from_commandline (command, "gnome-open",G_APP_INFO_CREATE_NONE, &error); ++ g_free (command); ++ ++ if (error == NULL && app_info != NULL) { ++ GdkScreen *screen; ++ GdkAppLaunchContext *context; ++ ++ screen = gtk_widget_get_screen (GTK_WIDGET (parent)); ++ context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen)); ++ g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (context), &error); ++ ++ g_object_unref (context); ++ g_object_unref (app_info); ++ } ++ } + + if (!found || error != NULL) { + GtkWidget *d; @@ -108,7 +120,6 @@ + G_CALLBACK (gtk_widget_destroy), NULL); + } + -+ g_free (command); + g_free (uri); +} Index: gnome-session/gsm-util.h @@ -123,7 +134,7 @@ G_BEGIN_DECLS -@@ -47,6 +48,9 @@ char * gsm_util_generate_startup_id +@@ -49,6 +50,9 @@ char * gsm_util_generate_startup_id void gsm_util_setenv (const char *variable, const char *value); @@ -137,7 +148,7 @@ =================================================================== --- gnome-session/Makefile.am.orig +++ gnome-session/Makefile.am -@@ -84,6 +84,10 @@ libgsmutil_la_SOURCES = \ +@@ -91,6 +91,10 @@ libgsmutil_la_SOURCES = \ gsm-util.c \ gsm-util.h @@ -259,7 +270,7 @@ g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate)); } -@@ -137,11 +99,23 @@ gsm_logout_dialog_init (GsmLogoutDialog +@@ -137,11 +99,22 @@ gsm_logout_dialog_init (GsmLogoutDialog logout_dialog->priv->timeout_id = 0; logout_dialog->priv->timeout = 0; logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; @@ -267,12 +278,11 @@ - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); + gtk_window_set_resizable (GTK_WINDOW (logout_dialog), FALSE); -+ gtk_dialog_set_has_separator (GTK_DIALOG (logout_dialog), FALSE); gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); gtk_window_stick (GTK_WINDOW (logout_dialog)); + /* use HIG spacings */ -+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), 12); ++ gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), 12); + gtk_container_set_border_width (GTK_CONTAINER (logout_dialog), 6); + + gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_HELP, @@ -284,7 +294,7 @@ logout_dialog->priv->up_client = up_client_new (); logout_dialog->priv->consolekit = gsm_get_consolekit (); -@@ -229,40 +203,28 @@ gsm_logout_supports_shutdown (GsmLogoutD +@@ -229,40 +202,28 @@ gsm_logout_supports_shutdown (GsmLogoutD } static void @@ -342,7 +352,7 @@ seconds_warning = ngettext ("You will be automatically logged " "out in %d second.", "You will be automatically logged " -@@ -270,7 +232,7 @@ gsm_logout_dialog_timeout (gpointer data +@@ -270,7 +231,7 @@ gsm_logout_dialog_timeout (gpointer data seconds_to_show); break; @@ -351,7 +361,7 @@ seconds_warning = ngettext ("This system will be automatically " "shut down in %d second.", "This system will be automatically " -@@ -278,6 +240,10 @@ gsm_logout_dialog_timeout (gpointer data +@@ -278,6 +239,10 @@ gsm_logout_dialog_timeout (gpointer data seconds_to_show); break; @@ -362,7 +372,7 @@ default: g_assert_not_reached (); } -@@ -312,25 +278,50 @@ gsm_logout_dialog_timeout (gpointer data +@@ -312,25 +277,50 @@ gsm_logout_dialog_timeout (gpointer data secondary_text = g_strdup (seconds_warning); } @@ -386,12 +396,12 @@ + int seconds_to_show; + + logout_dialog = (GsmLogoutDialog *) data; - -- g_free (secondary_text); ++ + if (!logout_dialog->priv->timeout) { + gtk_dialog_response (GTK_DIALOG (logout_dialog), + logout_dialog->priv->default_response); -+ + +- g_free (secondary_text); + return FALSE; + } + @@ -424,7 +434,7 @@ if (logout_dialog->priv->timeout_id != 0) { g_source_remove (logout_dialog->priv->timeout_id); -@@ -342,14 +333,118 @@ gsm_logout_dialog_set_timeout (GsmLogout +@@ -342,14 +332,120 @@ gsm_logout_dialog_set_timeout (GsmLogout } static GtkWidget * @@ -474,8 +484,10 @@ + gchar *markup; + GdkColor *color; + GtkWidget *label; ++ GtkStyle *style; + -+ color = &GTK_WIDGET (button)->style->fg[GTK_STATE_INSENSITIVE]; ++ style = gtk_widget_get_style (GTK_WIDGET (button)); ++ color = &style->fg[GTK_STATE_INSENSITIVE]; + markup = g_markup_printf_escaped ("<span size=\"small\" foreground=\"#%.2x%.2x%.2x\">%s</span>", + color->red, + color->green, @@ -545,7 +557,7 @@ if (current_dialog != NULL) { gtk_widget_destroy (GTK_WIDGET (current_dialog)); -@@ -359,83 +454,119 @@ gsm_get_dialog (GsmDialogLogoutType type +@@ -359,83 +455,119 @@ gsm_get_dialog (GsmDialogLogoutType type current_dialog = logout_dialog; @@ -553,7 +565,7 @@ - - logout_dialog->priv->type = type; + vbox = gtk_vbox_new (FALSE, 12); -+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), vbox, ++ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), vbox, + FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); + gtk_widget_show (vbox); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0