November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> backgroud_patches_bnc550934 : fix version in spec file
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 745f8974688675aa7cbca1db959b147aea4248ec Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 11:14:19 2009 +0100 fix version in spec file --- webclient/package/yast2-webclient.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 6c15808..789a438 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.19 +Version: 0.0.20 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 -- 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 : Revert "moved fetch_po to an own task in the top level Rakefile" revert schubis cosmetic changes This reverts commit 1a2a92a6252478730fd3d7e6f0be5c35e2d44663.
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/master commit da7293ffd2044052fa1096dd07f8638330b26cd0 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 11:08:16 2009 +0100 Revert "moved fetch_po to an own task in the top level Rakefile" revert schubis cosmetic changes This reverts commit 1a2a92a6252478730fd3d7e6f0be5c35e2d44663. --- Rakefile | 84 ++++++++++++-------------------------- webclient/lib/tasks/gettext.rake | 27 ++++++++++++ 2 files changed, 53 insertions(+), 58 deletions(-) diff --git a/Rakefile b/Rakefile index 042a48c..21f8667 100644 --- a/Rakefile +++ b/Rakefile @@ -8,74 +8,42 @@ desc 'Run all tests by default' task :default => :test -%w(makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| +%w(fetch_po makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| desc "Run #{task_name} task for all projects" + task task_name do + #remove translation statistik + File.delete(File.join("pot", "translation_status.yaml")) if task_name == "fetch_po" && File.exist?("pot/translation_status.yaml") + PROJECTS.each do |project| system %(cd #{project} && #{env} #{$0} #{task_name}) raise "Error on execute task #{task_name} on #{project}" if $?.exitstatus != 0 end - end -end -desc "Fetch po files from lcn. Parameter: source directory of lcn e.g. ...lcn/trunk/webyast/" -task :fetch_po, [:lcn_dir] do |t, args| - args.with_defaults(:lcn_dir => File.join(File.dirname(__FILE__),"../../", "lcn", "trunk","webyast")) - #remove translation statistik - File.delete(File.join("pot", "translation_status.yaml")) if File.exist?("pot/translation_status.yaml") - result = Hash.new() - - PROJECTS.each do |project| - system %(cd #{project} && #{env} #{$0} fetch_po #{args.lcn_dir}) - raise "Error on execute task fetch_po on #{project}" if $?.exitstatus != 0 - - #collecting translation information - Dir.glob("#{project}/**/*.po").each {|po_file| - output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` - language = File.basename(File.dirname(po_file)) - output.split(",").each {|column| - value = column.split(" ") - if value.size > 2 - if result.has_key? language - if result[language].has_key? value[1] - result[language][value[1]] += value[0].to_i - else - result[language][value[1]] = value[0].to_i + if task_name == "fetch_po" + #remove translations which have not at least 80 percent translated text + limit = Float(80) + result = Hash.new + result = YAML.load(File.open(File.join("pot", "translation_status.yaml"))) if File.exists?(File.join("pot", "translation_status.yaml")) + result.each {|key,value| + translated = un_translated = Float(0) + translated = value["translated"].to_f if value.has_key? "translated" + un_translated += value["untranslated"].to_f if value.has_key? "untranslated" + un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" + limit_eval = translated/(un_translated+translated) + if limit_eval < limit/100 + puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." + Dir.glob("**/#{key}/").each {|po_dir| + unless po_dir.include? "lang_helper" #do not delete translations for language selections +# puts "deleting #{po_dir}" +# remove_dir(po_dir, true) #force=true end - else - result[language] = Hash.new - result[language][value[1]] = value[0].to_i - end - end - } - } + } + end + } + end end - - #saving result to pot/translation_status.yaml - destdir = File.join(File.dirname(__FILE__), "pot") - Dir.mkdir destdir unless File.directory?(destdir) - f = File.open(File.join(destdir, "translation_status.yaml"), "w") - f.write(result.to_yaml) - f.close - #remove translations which have not at least 80 percent translated text - limit = Float(80) - result.each {|key,value| - translated = un_translated = Float(0) - translated = value["translated"].to_f if value.has_key? "translated" - un_translated += value["untranslated"].to_f if value.has_key? "untranslated" - un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" - limit_eval = translated/(un_translated+translated) - if limit_eval < limit/100 - puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." - Dir.glob("**/#{key}/").each {|po_dir| - unless po_dir.include? "lang_helper" #do not delete translations for language selections -# puts "deleting #{po_dir}" -# remove_dir(po_dir, true) #force=true - end - } - end - } end desc "Run doc to generate whole documentation" diff --git a/webclient/lib/tasks/gettext.rake b/webclient/lib/tasks/gettext.rake index 972de14..d0a00dc 100644 --- a/webclient/lib/tasks/gettext.rake +++ b/webclient/lib/tasks/gettext.rake @@ -51,5 +51,32 @@ task :fetch_po, [:lcn_dir] do |t, args| FileUtils.cp(po_file, destfile) end } + result = Hash.new() + destdir = File.join(File.dirname(__FILE__),"../../..", "pot") + Dir.mkdir destdir unless File.directory?(destdir) + result = YAML.load(File.open(File.join(destdir, "translation_status.yaml"))) if File.exists?(File.join(destdir, "translation_status.yaml")) + + Dir.glob("{po}/**/*.po").each {|po_file| + output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` + language = File.basename(File.dirname(po_file)) + output.split(",").each {|column| + value = column.split(" ") + if value.size > 2 + unless result[language].blank? + unless result[language][value[1]].blank? + result[language][value[1]] += value[0].to_i + else + result[language][value[1]] = value[0].to_i + end + else + result[language] = Hash.new + result[language][value[1]] = value[0].to_i + end + end + } + } + f = File.open(File.join(destdir, "translation_status.yaml"), "w") + f.write(result.to_yaml) + f.close 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] <web-client> backgroud_patches_bnc550934 : Revert "moved fetch_po to an own task in the top level Rakefile" revert schubis cosmetic changes This reverts commit 1a2a92a6252478730fd3d7e6f0be5c35e2d44663.
by J.Daniel Schmidt 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit da7293ffd2044052fa1096dd07f8638330b26cd0 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Tue Nov 24 11:08:16 2009 +0100 Revert "moved fetch_po to an own task in the top level Rakefile" revert schubis cosmetic changes This reverts commit 1a2a92a6252478730fd3d7e6f0be5c35e2d44663. --- Rakefile | 84 ++++++++++++-------------------------- webclient/lib/tasks/gettext.rake | 27 ++++++++++++ 2 files changed, 53 insertions(+), 58 deletions(-) diff --git a/Rakefile b/Rakefile index 042a48c..21f8667 100644 --- a/Rakefile +++ b/Rakefile @@ -8,74 +8,42 @@ desc 'Run all tests by default' task :default => :test -%w(makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| +%w(fetch_po makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| desc "Run #{task_name} task for all projects" + task task_name do + #remove translation statistik + File.delete(File.join("pot", "translation_status.yaml")) if task_name == "fetch_po" && File.exist?("pot/translation_status.yaml") + PROJECTS.each do |project| system %(cd #{project} && #{env} #{$0} #{task_name}) raise "Error on execute task #{task_name} on #{project}" if $?.exitstatus != 0 end - end -end -desc "Fetch po files from lcn. Parameter: source directory of lcn e.g. ...lcn/trunk/webyast/" -task :fetch_po, [:lcn_dir] do |t, args| - args.with_defaults(:lcn_dir => File.join(File.dirname(__FILE__),"../../", "lcn", "trunk","webyast")) - #remove translation statistik - File.delete(File.join("pot", "translation_status.yaml")) if File.exist?("pot/translation_status.yaml") - result = Hash.new() - - PROJECTS.each do |project| - system %(cd #{project} && #{env} #{$0} fetch_po #{args.lcn_dir}) - raise "Error on execute task fetch_po on #{project}" if $?.exitstatus != 0 - - #collecting translation information - Dir.glob("#{project}/**/*.po").each {|po_file| - output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` - language = File.basename(File.dirname(po_file)) - output.split(",").each {|column| - value = column.split(" ") - if value.size > 2 - if result.has_key? language - if result[language].has_key? value[1] - result[language][value[1]] += value[0].to_i - else - result[language][value[1]] = value[0].to_i + if task_name == "fetch_po" + #remove translations which have not at least 80 percent translated text + limit = Float(80) + result = Hash.new + result = YAML.load(File.open(File.join("pot", "translation_status.yaml"))) if File.exists?(File.join("pot", "translation_status.yaml")) + result.each {|key,value| + translated = un_translated = Float(0) + translated = value["translated"].to_f if value.has_key? "translated" + un_translated += value["untranslated"].to_f if value.has_key? "untranslated" + un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" + limit_eval = translated/(un_translated+translated) + if limit_eval < limit/100 + puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." + Dir.glob("**/#{key}/").each {|po_dir| + unless po_dir.include? "lang_helper" #do not delete translations for language selections +# puts "deleting #{po_dir}" +# remove_dir(po_dir, true) #force=true end - else - result[language] = Hash.new - result[language][value[1]] = value[0].to_i - end - end - } - } + } + end + } + end end - - #saving result to pot/translation_status.yaml - destdir = File.join(File.dirname(__FILE__), "pot") - Dir.mkdir destdir unless File.directory?(destdir) - f = File.open(File.join(destdir, "translation_status.yaml"), "w") - f.write(result.to_yaml) - f.close - #remove translations which have not at least 80 percent translated text - limit = Float(80) - result.each {|key,value| - translated = un_translated = Float(0) - translated = value["translated"].to_f if value.has_key? "translated" - un_translated += value["untranslated"].to_f if value.has_key? "untranslated" - un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" - limit_eval = translated/(un_translated+translated) - if limit_eval < limit/100 - puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." - Dir.glob("**/#{key}/").each {|po_dir| - unless po_dir.include? "lang_helper" #do not delete translations for language selections -# puts "deleting #{po_dir}" -# remove_dir(po_dir, true) #force=true - end - } - end - } end desc "Run doc to generate whole documentation" diff --git a/webclient/lib/tasks/gettext.rake b/webclient/lib/tasks/gettext.rake index 972de14..d0a00dc 100644 --- a/webclient/lib/tasks/gettext.rake +++ b/webclient/lib/tasks/gettext.rake @@ -51,5 +51,32 @@ task :fetch_po, [:lcn_dir] do |t, args| FileUtils.cp(po_file, destfile) end } + result = Hash.new() + destdir = File.join(File.dirname(__FILE__),"../../..", "pot") + Dir.mkdir destdir unless File.directory?(destdir) + result = YAML.load(File.open(File.join(destdir, "translation_status.yaml"))) if File.exists?(File.join(destdir, "translation_status.yaml")) + + Dir.glob("{po}/**/*.po").each {|po_file| + output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` + language = File.basename(File.dirname(po_file)) + output.split(",").each {|column| + value = column.split(" ") + if value.size > 2 + unless result[language].blank? + unless result[language][value[1]].blank? + result[language][value[1]] += value[0].to_i + else + result[language][value[1]] = value[0].to_i + end + else + result[language] = Hash.new + result[language][value[1]] = value[0].to_i + end + end + } + } + f = File.open(File.join(destdir, "translation_status.yaml"), "w") + f.write(result.to_yaml) + f.close 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] r59727 - /trunk/pkg-bindings/src/Package.cc
by lslezak＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: lslezak Date: Tue Nov 24 11:08:11 2009 New Revision: 59727 URL: http://svn.opensuse.org/viewcvs/yast?rev=59727&view=rev Log: - fixed a formatting warning Modified: trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Tue Nov 24 11:08:11 2009 @@ -2355,7 +2355,7 @@ // get the package files zypp::Package::FileList files( refpkg->filelist() ); - y2milestone("The reference package has %zd files", files.size()); + y2milestone("The reference package has %d files", files.size()); std::string product_file; zypp::str::smatch what; -- 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] r59726 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Network.cc
by lslezak＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: lslezak Date: Tue Nov 24 11:06:27 2009 New Revision: 59726 URL: http://svn.opensuse.org/viewcvs/yast?rev=59726&view=rev Log: - use zypp::Url::schemeIsRemote() instead of the hardcoded list (bnc#551661) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Network.cc 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 Tue Nov 24 11:06:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 24 09:40:12 UTC 2009 - lslezak(a)suse.cz + +- use zypp::Url::schemeIsRemote() instead of the hardcoded protocol + list (bnc#551661) + +------------------------------------------------------------------- Fri Oct 16 13:27:02 CEST 2009 - lslezak(a)suse.cz - added "check_alias" option to Pkg::RepositoryAdd() to allow Modified: trunk/pkg-bindings/src/Network.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Network.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Network.cc (original) +++ trunk/pkg-bindings/src/Network.cc Tue Nov 24 11:06:27 2009 @@ -60,10 +60,5 @@ bool PkgFunctions::remoteRepo(const zypp::Url &url) { // is it a remote repository? - std::string scheme(zypp::str::toLower(url.getScheme())); - - y2debug("Repository schema: %s", scheme.c_str()); - - return (scheme == "ftp" || scheme == "http" || scheme == "https" || scheme == "nfs" - || scheme == "smb"); + return url.schemeIsRemote(); } -- 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 : better indentation
by Klaus Kämpf 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 724cb3f0692189a1bc03066a4fc1db818879584c Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Tue Nov 24 10:39:46 2009 +0100 better indentation --- plugins/status/app/views/status/index.html.erb | 105 ++++++++++++------------ 1 files changed, 54 insertions(+), 51 deletions(-) diff --git a/plugins/status/app/views/status/index.html.erb b/plugins/status/app/views/status/index.html.erb index 35974a5..2bc2cff 100644 --- a/plugins/status/app/views/status/index.html.erb +++ b/plugins/status/app/views/status/index.html.erb @@ -1,72 +1,75 @@ <% content_for :head do %> -<script type="text/javascript"> + <script type="text/javascript"> -function refreshLogs() { + function refreshLogs() { -<% @logs.each do |log| %> - $('#log-<%= log.id %>-console').load('/status/ajax_log_custom?id=<%= log.id %>&lines=5'); -<% end %> -} + <% @logs.each do |log| %> + $('#log-<%= log.id %>-console').load('/status/ajax_log_custom?id=<%= log.id %>&lines=5'); + <% end %> + } -$(document).ready(function() { - $.ajaxSetup ({ - cache: false + $(document).ready(function() { + $.ajaxSetup ({ + cache: false + }); + //$('#log-console').addClass('busy'); + setInterval(refreshLogs, 10000); // refresh every 10 seconds }); - //$('#log-console').addClass('busy'); - setInterval(refreshLogs, 10000); // refresh every 10 seconds -}); -</script> + </script> <% end %> <div class='plugin-icon'><img src='/images/monitoring.png'/><%=_("Status")%></div> + <div class="plugin-content grid_12"> -<% @logs.each do |log| %> -<h2><%= log.description %></h2> -<div id="log-<%= log.id %>-console" -<%= log.path %> -</div> -<% end %> + <% @logs.each do |log| %> + <h2><%= log.description %></h2> + <div id="log-<%= log.id %>-console" + <%= log.path %> + </div> + <% end %> -<div id="log-console"> -</div> + <div id="log-console"> + </div> -<% column = 1 %> -<% @data_group.keys.sort.each do |key| %> - <% map = @data_group[key]%> - <% if column != 1 %> - <br style='clear: both'> - <br> - <% column = 1 %> - <% end %> - <% if key == "df" %> - <h3><%= _("Disk usage") %></h3> - <% else %> - <h3><%= key.tr('_',' ').capitalize %></h3> - <% end %> + <% column = 1 %> + <% @data_group.keys.sort.each do |key| %> + <% map = @data_group[key]%> + <% if column != 1 %> + <br style='clear: both'> + <br> + <% column = 1 %> + <% end %> + <% if key == "df" %> + <h3><%= _("Disk usage") %></h3> + <% else %> + <h3><%= key.tr('_',' ').capitalize %></h3> + <% end %> - <% map.keys.sort.each do |graph_key| %> - <% list_value = map[graph_key] %> - <% if key != "df" || !graph_key.end_with?("used") %> - <% graph_id = key + "_" + graph_key.tr('/','_') %> - <%= graph(graph_id, 200, 150, column == 4?true:false, @limits_list[:reached].include?("/" + key + "/" + graph_key)&&key=="df") %> - <% if column == 4 %> - <br> - <% column = 1 %> - <% else %> - <% column += 1 %> + <% map.keys.sort.each do |graph_key| %> + <% list_value = map[graph_key] %> + <% if key != "df" || !graph_key.end_with?("used") %> + <% graph_id = key + "_" + graph_key.tr('/','_') %> + <%= graph(graph_id, 200, 150, column == 4?true:false, @limits_list[:reached].include?("/" + key + "/" + graph_key)&&key=="df") %> + <% if column == 4 %> + <br> + <% column = 1 %> + <% else %> + <% column += 1 %> + <% end %> <% end %> <% end %> <% end %> -<% end %> -<% if column != 1 %> - <br style='clear: both'> - <br> -<% end %> -<%= link_to _("Edit Limits"), '/status/edit', :class => "button" %> -<a href="/" class="button"><%=_("Back")%></a> + + <% if column != 1 %> + <br style='clear: both'> + <br> + <% end %> + + <%= link_to _("Edit Limits"), '/status/edit', :class => "button" %> + <a href="/" class="button"><%=_("Back")%></a> </div> <script type="text/javascript"> -- 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> backgroud_patches_bnc550934 : better indentation
by Klaus Kämpf 24 Nov '09

24 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 724cb3f0692189a1bc03066a4fc1db818879584c Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Tue Nov 24 10:39:46 2009 +0100 better indentation --- plugins/status/app/views/status/index.html.erb | 105 ++++++++++++------------ 1 files changed, 54 insertions(+), 51 deletions(-) diff --git a/plugins/status/app/views/status/index.html.erb b/plugins/status/app/views/status/index.html.erb index 35974a5..2bc2cff 100644 --- a/plugins/status/app/views/status/index.html.erb +++ b/plugins/status/app/views/status/index.html.erb @@ -1,72 +1,75 @@ <% content_for :head do %> -<script type="text/javascript"> + <script type="text/javascript"> -function refreshLogs() { + function refreshLogs() { -<% @logs.each do |log| %> - $('#log-<%= log.id %>-console').load('/status/ajax_log_custom?id=<%= log.id %>&lines=5'); -<% end %> -} + <% @logs.each do |log| %> + $('#log-<%= log.id %>-console').load('/status/ajax_log_custom?id=<%= log.id %>&lines=5'); + <% end %> + } -$(document).ready(function() { - $.ajaxSetup ({ - cache: false + $(document).ready(function() { + $.ajaxSetup ({ + cache: false + }); + //$('#log-console').addClass('busy'); + setInterval(refreshLogs, 10000); // refresh every 10 seconds }); - //$('#log-console').addClass('busy'); - setInterval(refreshLogs, 10000); // refresh every 10 seconds -}); -</script> + </script> <% end %> <div class='plugin-icon'><img src='/images/monitoring.png'/><%=_("Status")%></div> + <div class="plugin-content grid_12"> -<% @logs.each do |log| %> -<h2><%= log.description %></h2> -<div id="log-<%= log.id %>-console" -<%= log.path %> -</div> -<% end %> + <% @logs.each do |log| %> + <h2><%= log.description %></h2> + <div id="log-<%= log.id %>-console" + <%= log.path %> + </div> + <% end %> -<div id="log-console"> -</div> + <div id="log-console"> + </div> -<% column = 1 %> -<% @data_group.keys.sort.each do |key| %> - <% map = @data_group[key]%> - <% if column != 1 %> - <br style='clear: both'> - <br> - <% column = 1 %> - <% end %> - <% if key == "df" %> - <h3><%= _("Disk usage") %></h3> - <% else %> - <h3><%= key.tr('_',' ').capitalize %></h3> - <% end %> + <% column = 1 %> + <% @data_group.keys.sort.each do |key| %> + <% map = @data_group[key]%> + <% if column != 1 %> + <br style='clear: both'> + <br> + <% column = 1 %> + <% end %> + <% if key == "df" %> + <h3><%= _("Disk usage") %></h3> + <% else %> + <h3><%= key.tr('_',' ').capitalize %></h3> + <% end %> - <% map.keys.sort.each do |graph_key| %> - <% list_value = map[graph_key] %> - <% if key != "df" || !graph_key.end_with?("used") %> - <% graph_id = key + "_" + graph_key.tr('/','_') %> - <%= graph(graph_id, 200, 150, column == 4?true:false, @limits_list[:reached].include?("/" + key + "/" + graph_key)&&key=="df") %> - <% if column == 4 %> - <br> - <% column = 1 %> - <% else %> - <% column += 1 %> + <% map.keys.sort.each do |graph_key| %> + <% list_value = map[graph_key] %> + <% if key != "df" || !graph_key.end_with?("used") %> + <% graph_id = key + "_" + graph_key.tr('/','_') %> + <%= graph(graph_id, 200, 150, column == 4?true:false, @limits_list[:reached].include?("/" + key + "/" + graph_key)&&key=="df") %> + <% if column == 4 %> + <br> + <% column = 1 %> + <% else %> + <% column += 1 %> + <% end %> <% end %> <% end %> <% end %> -<% end %> -<% if column != 1 %> - <br style='clear: both'> - <br> -<% end %> -<%= link_to _("Edit Limits"), '/status/edit', :class => "button" %> -<a href="/" class="button"><%=_("Back")%></a> + + <% if column != 1 %> + <br style='clear: both'> + <br> + <% end %> + + <%= link_to _("Edit Limits"), '/status/edit', :class => "button" %> + <a href="/" class="button"><%=_("Back")%></a> </div> <script type="text/javascript"> -- 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] r59725 - /tags/stable-2_19_0/network/
by kmachalkova＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: kmachalkova Date: Tue Nov 24 10:14:23 2009 New Revision: 59725 URL: http://svn.opensuse.org/viewcvs/yast?rev=59725&view=rev Log: Created tag stable-2_19_0 for network Added: tags/stable-2_19_0/network/ - copied from r59724, trunk/network/ -- 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] r59724 - in /trunk/network: VERSION package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 24 Nov '09

24 Nov '09

Author: kmachalkova Date: Tue Nov 24 10:13:48 2009 New Revision: 59724 URL: http://svn.opensuse.org/viewcvs/yast?rev=59724&view=rev Log: changes Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=59724&r1=597… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Nov 24 10:13:48 2009 @@ -1 +1 @@ -2.18.63 +2.19.0 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Nov 24 10:13:48 2009 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Nov 24 10:06:26 CET 2009 - kmachalkova(a)suse.cz + +Cumulative patch with SLE11 SP1 bugfixes and features +- Introduced <dns><write_hostname> option to AY profile to allow + overriding product default write_hostname_to_hosts (FaTE#305281) +- DNS Import: read product default write_hostname (bnc#500568) and + hostname/domain from the system (generate random if needed - + bnc#502715) +- Read defaults and propose values in inst_hostname only once + (bnc#438124) +- Do not append 127.0.0.2 line when it is not needed (bnc#469752) +- Validate no proxy domains (for FaTE#302377) +- 2.19.0 + +------------------------------------------------------------------- Mon Nov 23 13:32:59 CET 2009 - mzugec(a)suse.cz - exclude nfsroot devices from bridged slaves (bnc#557688) -- 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 : create an SSL certificate with the best hostname, do not start yastwc without a certificate (bnc#557752), version 0.0.20
by J.Daniel Schmidt 23 Nov '09

23 Nov '09

ref: refs/heads/master commit c2db5a722725ee68bf539b29d8369ed71508d088 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Mon Nov 23 18:18:20 2009 +0100 create an SSL certificate with the best hostname, do not start yastwc without a certificate (bnc#557752), version 0.0.20 --- webclient/package/check-create-certificate.pl | 22 ++++++++++++++++------ webclient/package/yast2-webclient.changes | 7 +++++++ webclient/package/yastwc | 8 +++++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl index e63c328..8fb27a2 100755 --- a/webclient/package/check-create-certificate.pl +++ b/webclient/package/check-create-certificate.pl @@ -70,9 +70,9 @@ emailAddress = root\@$fqdn chomp $CNF; chomp $CERT; chomp $KEY; - if ( not defined $CNF || $CNF =~ /^$/ || - not defined $CERT || $CERT =~ /^$/ || - not defined $KEY || $KEY =~ /^$/ ) + if ( (not defined $CNF ) || $CNF =~ /^$/ || + (not defined $CERT) || $CERT =~ /^$/ || + (not defined $KEY ) || $KEY =~ /^$/ ) { print STDERR "Could not create temporary files. Aborting.\n"; return 0; @@ -178,10 +178,20 @@ if (defined $create) $hostname = `hostname --fqdn` unless defined $hostname; chomp $hostname if defined $hostname; - unless (defined $hostname) + if ( (not defined $hostname) || $hostname =~ /^$/) { - print STDERR "Hostname missing or invalid. Aborting.\n"; - exit 1; + # do not abort, just create a certificate (bnc#557752) + #print STDERR "Hostname missing or invalid. Aborting.\n"; + #exit 1; + + print STDERR "No fully qualified domain name can be found. Please fix your DNS setup.\n"; + print STDERR "Using only the hostname for SSL certificate.\n"; + $hostname = `hostname`; + chomp $hostname if defined $hostname; + if ( (not defined $hostname) || $hostname =~ /^$/) + { + $hostname = 'localhost'; + } } if ( create_certificate( $hostname, $certfile, $keyfile, $combinedfile ) ) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index c5f0686..5dbf1cb 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 23 18:15:24 CET 2009 - jdsn(a)suse.de + +- create an SSL certificate with the best hostname (bnc#557752) +- do not start yastwc without a certificate (bnc#557752) +- 0.0.20 + +------------------------------------------------------------------- Mon Nov 23 12:19:02 CET 2009 - jdsn(a)suse.de - log check-create-certificate output to logfile diff --git a/webclient/package/yastwc b/webclient/package/yastwc index 99acd07..f25a61a 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -179,7 +179,13 @@ case "$1" in if [ ! -e $COMBINEDCERTFILE ] then echo "No certificate found. Creating one now." - /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE >/srv/www/yast/log/check-create-certificate.log 2>&1 + if ! /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE >/srv/www/yast/log/check-create-certificate.log 2>&1 + then + echo -n "Can not create certificate. Please see /srv/www/yast/log/check-create-certificate.log for details." + rc_failed + rc_status -v + rc_exit + fi chown lighttpd:lighttpd $CERTIFICATEFILE $CERTKEYFILE $COMBINEDCERTFILE fi -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0