July 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : render only once
by Duncan Mac-Vicar P 20 Jul '09

20 Jul '09

ref: refs/heads/master commit d3a4ab29502d3a73dfd498a9e8bac5b1c0a2b616 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Jul 20 14:42:50 2009 +0200 render only once --- .../app/controllers/application_controller.rb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/webclient/app/controllers/application_controller.rb b/webclient/app/controllers/application_controller.rb index 0e2d820..8ba474f 100644 --- a/webclient/app/controllers/application_controller.rb +++ b/webclient/app/controllers/application_controller.rb @@ -26,6 +26,7 @@ class ApplicationController < ActionController::Base @error = e #render :text => "I am sorry" render :template => "shared/exception_trap" + return end def ensure_login -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Added Dropshadow for Login-Box (FF3.1++, Webkit)
by Robert Lihm 20 Jul '09

20 Jul '09

ref: refs/heads/master commit 5db759f750b4b7ca3c8323afa71cbc8483653e8d Author: Robert Lihm <rlihm(a)lihmedia.org> Date: Mon Jul 20 14:00:33 2009 +0200 Added Dropshadow for Login-Box (FF3.1++, Webkit) --- webclient/public/stylesheets/style.css | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index ce432b9..9de95dd 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -142,12 +142,16 @@ input:focus { width: 23em; min-height: 17em; /* FIXME not working in IE6 */ background: #999; - margin: 0 auto; + margin: 10px auto; overflow: hidden; color: #666; -moz-border-radius: 5px; -webkit-border-radius: 5px; + + -moz-box-shadow: 0 1px 7px #999; + -webkit-box-shadow: 0 1px 7px #999; + box-shadow: 0 1px 7px #999; } #login-dialogue form { display: block; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58118 - in /trunk/mail: package/yast2-mail.changes src/Mail.ycp src/ui.ycp
by varkoly＠svn.opensuse.org 20 Jul '09

20 Jul '09

Author: varkoly Date: Mon Jul 20 12:49:00 2009 New Revision: 58118 URL: http://svn.opensuse.org/viewcvs/yast?rev=58118&view=rev Log: bnc#491113 - fetchmail demon is started though disabled in runlevel editor when configuring email via network services Modified: trunk/mail/package/yast2-mail.changes trunk/mail/src/Mail.ycp trunk/mail/src/ui.ycp Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Mon Jul 20 12:49:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 20 12:31:04 CEST 2009 - varkoly(a)suse.de + +- bnc#491113 - fetchmail demon is started though disabled in runlevel + editor when configuring email via network services + +------------------------------------------------------------------- Mon Jul 20 10:41:06 CEST 2009 - varkoly(a)suse.de - bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=58118&r1=5… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Mon Jul 20 12:49:00 2009 @@ -133,16 +133,10 @@ /** * When should fetchmail run: * <dl> - * <dt> `manual <dd> - * <dt> `ppp <dd> for a ppp conection, /etc/ppp/ip-{up,down}.d - * <dt> `network <dd> for any network connection, - * /etc/sysconfig/network/if-{up,down}.d - * </dl> - * #22903 - * Unused yet! - * #37139, just enable rcfetchmail. + * <dt> "manual" <dd> + * <dt> "daemon" <dd> */ - global symbol fetchmail_mode = `manual; + global string fetchmail_mode = "manual"; /** *List of maps: @@ -333,7 +327,7 @@ * @return Whether rcfetchmail should run */ define boolean RunFetchmailGlobally () ``{ - return size (fetchmail) > 0; + return ( fetchmail_mode == "daemon" && size (fetchmail) > 0 ); } /** @@ -544,9 +538,10 @@ { return false; } - // read 4 - // TODO - fetchmail_mode = `manual; + if( Service::Enabled ("fetchmail") ) + { + fetchmail_mode = "daemon"; + } // if we are testing as non-root, it will fail, that's OK map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user"); Modified: trunk/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=58118&r1=581… ============================================================================== --- trunk/mail/src/ui.ycp (original) +++ trunk/mail/src/ui.ycp Mon Jul 20 12:49:00 2009 @@ -479,6 +479,9 @@ `HSpacing (1), // pushbutton `Bottom (`PushButton (`id (`downloading), `opt (`key_F7), _("&Details..."))) + ), + `HBox ( + `Left(`ComboBox (`id (`fm_start),_("Start &fetchmail"),["manual","daemon"])) ) ); // frame label: mail downloading (fetchmail) @@ -533,6 +536,7 @@ WJ_GetWidget (`delivery_mode); // initialize the widget (set the current value) CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + UI::ChangeWidget(`id(`fm_start),`Value, Mail::fetchmail_mode); // nothing entered in the dowloading items - don't save them boolean fm_empty = true; @@ -557,9 +561,9 @@ } else if (ret == `next || contains (buttons, ret)) { + Mail::fetchmail_mode = (string) UI::QueryWidget(`id (`fm_start), `Value); // input validation // For consistency, all querywidgets are done here - if (WJ_Validate (widgets)) { fm_empty = -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : no exceptions escape
by Duncan Mac-Vicar P 20 Jul '09

20 Jul '09

ref: refs/heads/master commit c6c8f152bfbf5b98ad1adf3dbc7357706a3911fe Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Jul 20 12:41:22 2009 +0200 no exceptions escape --- .../app/controllers/patch_updates_controller.rb | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/plugins/patch_updates/app/controllers/patch_updates_controller.rb b/plugins/patch_updates/app/controllers/patch_updates_controller.rb index ce4c0de..d6ce540 100644 --- a/plugins/patch_updates/app/controllers/patch_updates_controller.rb +++ b/plugins/patch_updates/app/controllers/patch_updates_controller.rb @@ -12,8 +12,14 @@ class PatchUpdatesController < ApplicationController logger.debug "Available patches: #{(a)patch_updates.inspect}" end + # this action is rendered as a partial, so it can't throw def show_summary - patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all + patch_updates = nil + begin + patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all + rescue + patch_updates = nil + end unless patch_updates flash.clear #no flash from load_proxy -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Added new status icons (image map + css)
by Robert Lihm 20 Jul '09

20 Jul '09

ref: refs/heads/master commit 488a63e7d8f4b04b1d8e1d9ea243b3a03b7dd13b Author: Robert Lihm <rlihm(a)lihmedia.org> Date: Mon Jul 20 11:09:45 2009 +0200 Added new status icons (image map + css) --- .gitignore | 10 +------ .../views/patch_updates/.__patch_summary.html.erb | Bin 4096 -> 0 bytes .../views/patch_updates/_patch_summary.html.erb | 4 +++ webclient/app/views/layouts/main.rhtml | 6 +--- .../public/stylesheets/images/status-imagemap.png | Bin 0 -> 1963 bytes webclient/public/stylesheets/style.css | 27 ++++++++++++++++++++ 6 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index fbe5592..913ada8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,3 @@ -# ignore package directory -package/ *~ -\#*\# -.\#* -*.bak -package -locale -coverage/ \ No newline at end of file +._* +diff.diff diff --git a/plugins/patch_updates/app/views/patch_updates/.__patch_summary.html.erb b/plugins/patch_updates/app/views/patch_updates/.__patch_summary.html.erb deleted file mode 100644 index bc723d2..0000000 Binary files a/plugins/patch_updates/app/views/patch_updates/.__patch_summary.html.erb and /dev/null differ diff --git a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb index 58c9aa1..0d67f4d 100644 --- a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb +++ b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb @@ -6,12 +6,16 @@ <% link_to "patch_updates" do %> <% if patch[:security]+patch[:important] > 0 %> <img src="/images/button_critical.png" alt="System need update"/> + <div class="status-icon error"></div> <% elsif patch[:optional] %> <img src="/images/button_warning.png" alt="System contains any update" /> + <div class="status-icon warning"></div> <% else %> <img src="/images/button_ok.png" alt="No updates available"/> + <div class="status-icon ok"></div> <% end %> + <% any_update = false %> <% if patch[:security] > 0 %> <%= _("Security Updates: #{patch[:security]} ") %> diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml index 0b5b68b..693dbb6 100644 --- a/webclient/app/views/layouts/main.rhtml +++ b/webclient/app/views/layouts/main.rhtml @@ -69,11 +69,7 @@ </div> <%= @content_for_layout %> - </div> <div id="footer" class=""> - <div class="copy">© 2009 Novell, Inc.</div> - </div> - </body> -</html> \ No newline at end of file + <div class="copy">© 2009 Novell, Inc.</di \ No newline at end of file diff --git a/webclient/public/stylesheets/images/status-imagemap.png b/webclient/public/stylesheets/images/status-imagemap.png new file mode 100644 index 0000000..9fd3247 Binary files /dev/null and b/webclient/public/stylesheets/images/status-imagemap.png differ diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index 2915562..ce432b9 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -277,3 +277,30 @@ input.button:hover { background-color: #ccc; text-shadow: 0 -1px 0 #666; } + +/* ==Status Icons ==*/ +/* -- HTML Example -- + <div class="status-icon ok"></div> + <div class="status-icon warning"></div> + <div class="status-icon error"></div> + <div class="status-icon optional"></div> +*/ +.status-icon { + display: block; + width: 23px; + height: 23px; + background: transparent url(images/status-imagemap.png) no-repeat scroll 0 0; +} +.status-icon.ok { + background-position: 0 0; +} +.status-icon.warning { + background-position: 0 -22px; +} +.status-icon.error { + background-position: 0 -44px; +} +.status-icon.optional { + background-position: 0 -66px; +} +/* ==/Status Icons ==*/ \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58117 - in /trunk/mail: package/yast2-mail.changes src/YaPI/MailServer.pm
by varkoly＠svn.opensuse.org 20 Jul '09

20 Jul '09

Author: varkoly Date: Mon Jul 20 10:42:27 2009 New Revision: 58117 URL: http://svn.opensuse.org/viewcvs/yast?rev=58117&view=rev Log: bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings Modified: trunk/mail/package/yast2-mail.changes trunk/mail/src/YaPI/MailServer.pm Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Mon Jul 20 10:42:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 20 10:41:06 CEST 2009 - varkoly(a)suse.de + +- bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings +- alias map ldap search must be sub + +------------------------------------------------------------------- Tue Apr 14 12:42:18 CEST 2009 - varkoly(a)suse.de - bnc#490688 â rename mail server module from "Mail Transfer Agent" to "Mail Server" Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Mon Jul 20 10:42:27 2009 @@ -2960,7 +2960,16 @@ write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_folder.cf, ldap:/etc/postfix/ldapalias_maps.cf'); + my $alias_maps = read_attribute($MainCf,'alias_maps'); + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf'; + } + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf'; + } + write_attribute($MainCf,'alias_maps',$alias_maps); check_ldap_configuration('transport_maps',$ldapMap); check_ldap_configuration('smtp_tls_per_site',$ldapMap); check_ldap_configuration('masquerade_domains',$ldapMap); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : status.rb does not need to be an activeresource model
by Duncan Mac-Vicar P 20 Jul '09

20 Jul '09

ref: refs/heads/master commit dd5d07e95ae49446cbc0f1e117665daf1d002c0f Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Jul 20 10:19:56 2009 +0200 status.rb does not need to be an activeresource model --- plugins/status/app/models/status.rb | 182 ----------------------------------- plugins/status/lib/status.rb | 182 +++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 182 deletions(-) diff --git a/plugins/status/app/models/status.rb b/plugins/status/app/models/status.rb deleted file mode 100644 index a31ef24..0000000 --- a/plugins/status/app/models/status.rb +++ /dev/null @@ -1,182 +0,0 @@ -class Status < ActiveRecord::Base - require 'scr' - require 'yaml' - - attr_accessor :data, - :datapath, - :health_status, - :metrics - - def initialize() - @scr = Scr.instance - @health_status = nil - @data = Hash.new - start_collectd - - @datapath = set_datapath - @metrics = available_metrics - - #find the correct plugin path for the config file - plugin_config_dir = "#{RAILS_ROOT}/config" #default - Rails.configuration.plugin_paths.each do |plugin_path| - if File.directory?(File.join(plugin_path, "status")) - plugin_config_dir = plugin_path+"/status/config" - Dir.mkdir(plugin_config_dir) unless File.directory?(plugin_config_dir) - break - end - end - @limits = {} - @limits = YAML.load(File.open(File.join(plugin_config_dir, "status_limits.yaml"))) if File.exists?(File.join(plugin_config_dir, "status_limits.yaml")) - end - - def start_collectd - cmd = @scr.execute(["collectd"]) - @timestamp = Time.now - end - - def stop_collectd - cmd = @scr.execute(["killall", "collectd"]) - @timestamp = nil - end - - # set path of stored rrd files, default: /var/lib/collectd/$host.$domain - def set_datapath(path=nil) - if path.blank? #FIXME: read currently used rrdb file from /etc/collectd.conf - cmd = IO.popen("ls /var/lib/collectd/") - path = cmd.read - cmd.close - path = path.split " " #FIXME - @datapath = "/var/lib/collectd/#{path[0].strip}" - else # set default path - @datapath = path.chomp("/") - end - return @datapath - end - - def available_metrics - @metrics = Hash.new - cmd = IO.popen("ls #{@datapath}") - output = cmd.read - cmd.close - output.split(" ").each do |l| - fp = IO.popen("ls #{@datapath}/#{l}") - files = fp.read - fp.close - rrds = Array.new - files.split(" ").each do |d| - rrds << d if d.include? ".rrd" #only .rrd files - @metrics["#{l}"] = { :rrds => rrds} - end - end - return @metrics - end - - def available_metric_files - cmd = IO.popen("ls #{@datapath}..") - lines = cmd.read.split "\n" - cmd.close - return lines - end - - def determine_status - end - - def draw_graph(heigth=nil, width=nil) - end - - # creates several metrics for a defined period - def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}) - available_metrics - result = Hash.new - unless @timestamp.nil? # collectd not started - case data - when nil, "all", "All" # all metrics - @metrics.each_pair do |m, n| - @metrics["#{m}"][:rrds].each do |rrdb| - result["#{rrdb}".chomp(".rrd")] = fetch_metric("#{m}/#{rrdb}", start, stop) - end - @data["#{m}"] = result - result = Hash.new - end - else # only metrics in data - data.each do |d| - @metrics.each_pair do |m, n| - if m.include?(d) - @metrics["#{m}"][:rrds].each do |rrdb| - result["#{rrdb}".chomp(".rrd")] = fetch_metric("#{m}/#{rrdb}", start, stop) - end - @data["#{m}"] = result - result = Hash.new - end - end - end - end - end - return @data - end - - # creates one metric for defined period - def fetch_metric(rrdfile, start=nil, stop=nil) - result = Hash.new - if start.blank? - start = "--start #{Time.now.strftime("%H:%M,%m/%d/%Y")}" - else - start = "--start #{start}" - end - if stop.blank? - stop = "--end #{Time.now.strftime("%H:%M,%m/%d/%Y")}" - else - stop = "--end #{stop}" - end - cmd = IO.popen("rrdtool fetch #{@datapath}/#{rrdfile} AVERAGE #{start} #{stop}") - output = cmd.read - cmd.close - return "failed" if output.blank? - - labels="" - output = output.gsub(",", ".") # translates eg. 1,234e+07 to 1.234e+07 - lines = output.split "\n" - - # set label names - lines[0].each do |l| - if l =~ /\D*/ - labels = l.split " " - end - end - unless labels.blank? - # set values for each label and time - lines.each do |l| # each time - unless l.blank? - if l =~ /\d*:\D*/ - pair = l.split ":" - values = pair[1].split " " - column = 0 - values.each do |v| # each label - if v != "nan" #store valid values only - result["#{labels[column]}"] ||= Hash.new - result["#{labels[column]}"].merge!({"T_#{pair[0].chomp(": ")}" => v}) - column += 1 - end - end - end - end - end - - #setting the limits - result.each do |key, value| - - path = rrdfile.chomp(".rrd") - path +="/" + key if key!="value" #do not take care about the value flag - path = path.tr('-','_') - if @limits.has_key?(path) - result[key] ||= Hash.new - result[key].merge!({"limit" => @limits[path] }) - end - end - - return result - else - return "failed" - end - end -end diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb new file mode 100644 index 0000000..42cb73d --- /dev/null +++ b/plugins/status/lib/status.rb @@ -0,0 +1,182 @@ +class Status + require 'scr' + require 'yaml' + + attr_accessor :data, + :datapath, + :health_status, + :metrics + + def initialize() + @scr = Scr.instance + @health_status = nil + @data = Hash.new + start_collectd + + @datapath = set_datapath + @metrics = available_metrics + + #find the correct plugin path for the config file + plugin_config_dir = "#{RAILS_ROOT}/config" #default + Rails.configuration.plugin_paths.each do |plugin_path| + if File.directory?(File.join(plugin_path, "status")) + plugin_config_dir = plugin_path+"/status/config" + Dir.mkdir(plugin_config_dir) unless File.directory?(plugin_config_dir) + break + end + end + @limits = {} + @limits = YAML.load(File.open(File.join(plugin_config_dir, "status_limits.yaml"))) if File.exists?(File.join(plugin_config_dir, "status_limits.yaml")) + end + + def start_collectd + cmd = @scr.execute(["collectd"]) + @timestamp = Time.now + end + + def stop_collectd + cmd = @scr.execute(["killall", "collectd"]) + @timestamp = nil + end + + # set path of stored rrd files, default: /var/lib/collectd/$host.$domain + def set_datapath(path=nil) + if path.blank? #FIXME: read currently used rrdb file from /etc/collectd.conf + cmd = IO.popen("ls /var/lib/collectd/") + path = cmd.read + cmd.close + path = path.split " " #FIXME + @datapath = "/var/lib/collectd/#{path[0].strip}" + else # set default path + @datapath = path.chomp("/") + end + return @datapath + end + + def available_metrics + @metrics = Hash.new + cmd = IO.popen("ls #{@datapath}") + output = cmd.read + cmd.close + output.split(" ").each do |l| + fp = IO.popen("ls #{@datapath}/#{l}") + files = fp.read + fp.close + rrds = Array.new + files.split(" ").each do |d| + rrds << d if d.include? ".rrd" #only .rrd files + @metrics["#{l}"] = { :rrds => rrds} + end + end + return @metrics + end + + def available_metric_files + cmd = IO.popen("ls #{@datapath}..") + lines = cmd.read.split "\n" + cmd.close + return lines + end + + def determine_status + end + + def draw_graph(heigth=nil, width=nil) + end + + # creates several metrics for a defined period + def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}) + available_metrics + result = Hash.new + unless @timestamp.nil? # collectd not started + case data + when nil, "all", "All" # all metrics + @metrics.each_pair do |m, n| + @metrics["#{m}"][:rrds].each do |rrdb| + result["#{rrdb}".chomp(".rrd")] = fetch_metric("#{m}/#{rrdb}", start, stop) + end + @data["#{m}"] = result + result = Hash.new + end + else # only metrics in data + data.each do |d| + @metrics.each_pair do |m, n| + if m.include?(d) + @metrics["#{m}"][:rrds].each do |rrdb| + result["#{rrdb}".chomp(".rrd")] = fetch_metric("#{m}/#{rrdb}", start, stop) + end + @data["#{m}"] = result + result = Hash.new + end + end + end + end + end + return @data + end + + # creates one metric for defined period + def fetch_metric(rrdfile, start=nil, stop=nil) + result = Hash.new + if start.blank? + start = "--start #{Time.now.strftime("%H:%M,%m/%d/%Y")}" + else + start = "--start #{start}" + end + if stop.blank? + stop = "--end #{Time.now.strftime("%H:%M,%m/%d/%Y")}" + else + stop = "--end #{stop}" + end + cmd = IO.popen("rrdtool fetch #{@datapath}/#{rrdfile} AVERAGE #{start} #{stop}") + output = cmd.read + cmd.close + return "failed" if output.blank? + + labels="" + output = output.gsub(",", ".") # translates eg. 1,234e+07 to 1.234e+07 + lines = output.split "\n" + + # set label names + lines[0].each do |l| + if l =~ /\D*/ + labels = l.split " " + end + end + unless labels.blank? + # set values for each label and time + lines.each do |l| # each time + unless l.blank? + if l =~ /\d*:\D*/ + pair = l.split ":" + values = pair[1].split " " + column = 0 + values.each do |v| # each label + if v != "nan" #store valid values only + result["#{labels[column]}"] ||= Hash.new + result["#{labels[column]}"].merge!({"T_#{pair[0].chomp(": ")}" => v}) + column += 1 + end + end + end + end + end + + #setting the limits + result.each do |key, value| + + path = rrdfile.chomp(".rrd") + path +="/" + key if key!="value" #do not take care about the value flag + path = path.tr('-','_') + if @limits.has_key?(path) + result[key] ||= Hash.new + result[key].merge!({"limit" => @limits[path] }) + end + end + + return result + else + return "failed" + end + end +end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58116 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes yast2-pkg-bindings.spec.in
by coolo＠svn.opensuse.org 19 Jul '09

19 Jul '09

Author: coolo Date: Sun Jul 19 10:11:47 2009 New Revision: 58116 URL: http://svn.opensuse.org/viewcvs/yast?rev=58116&view=rev Log: revert file list change that slipped in when mvidner added license Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/yast2-pkg-bindings.spec.in Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Sun Jul 19 10:11:47 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Jul 19 10:08:53 CEST 2009 - coolo(a)novell.com + +- revert file list changes that slipped in while adding licenses + +------------------------------------------------------------------- Fri Jul 10 11:18:04 CEST 2009 - lslezak(a)suse.cz - clean existing cache for added repositories, do not reuse Modified: trunk/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/yast2-pkg-bindings.… ============================================================================== --- trunk/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ trunk/pkg-bindings/yast2-pkg-bindings.spec.in Sun Jul 19 10:11:47 2009 @@ -23,14 +23,11 @@ @INSTALL@ rm -rf %{buildroot}/@plugindir@/libpy2Pkg.la -rm -rf %{buildroot}/@plugindir@/libpy2Pkg.so -rm -rf %{buildroot}/@plugindir@/libpy2Pkgzypp.la @CLEAN@ %files %defattr(-,root,root) @plugindir@/libpy2Pkg.so.* -@plugindir@/libpy2Pkgzypp.so -@plugindir@/libpy2Pkgzypp.so.* +@plugindir@/libpy2Pkg.so %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58115 - in /branches/SuSE-Code-11-Branch/gtk: ChangeLog src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 18 Jul '09

18 Jul '09

Author: rpmcruz Date: Sat Jul 18 16:42:58 2009 New Revision: 58115 URL: http://svn.opensuse.org/viewcvs/yast?rev=58115&view=rev Log: * src/yzyppwrapper.cc: bug fix 504424: don't crash on empty Package::group(). Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog branches/SuSE-Code-11-Branch/gtk/src/yzyppwrapper.cc Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/Chang… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-Branch/gtk/ChangeLog Sat Jul 18 16:42:58 2009 @@ -1,3 +1,8 @@ +2009-07-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/yzyppwrapper.cc: bug fix 504424: don't crash on empty + Package::group(). + 2009-03-11 Martin Kudlvasr <mkudlvasr(a)novell.com> * Version 2.17.13 Modified: branches/SuSE-Code-11-Branch/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/yzyppwrapper.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/yzyppwrapper.cc Sat Jul 18 16:42:58 2009 @@ -90,7 +90,8 @@ Ypp::Node *add (const std::string &tree_str, const std::string &order) { const gchar delimiter[2] = { delim, '\0' }; - gchar **nodes_str = g_strsplit (tree_str.c_str(), delimiter, -1); + const char *tree_cstr = tree_str.empty() ? _("Uncategorized") : tree_str.c_str(); + gchar **nodes_str = g_strsplit (tree_cstr, delimiter, -1); GNode *parent = root, *sibling = 0; Ypp::Node *ret = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58114 - /tags/stable-2_18_19/installation/
by locilka＠svn.opensuse.org 18 Jul '09

18 Jul '09

Author: locilka Date: Sat Jul 18 10:21:01 2009 New Revision: 58114 URL: http://svn.opensuse.org/viewcvs/yast?rev=58114&view=rev Log: Created tag stable-2_18_19 for installation Added: tags/stable-2_18_19/installation/ - copied from r58113, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0