August 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r58273 - in /branches/SuSE-SLE-10-SP3-Branch/network: VERSION package/yast2-network.changes src/lan/hardware.ycp src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 04 Aug '09

04 Aug '09

Author: mzugec Date: Tue Aug 4 14:52:38 2009 New Revision: 58273 URL: http://svn.opensuse.org/viewcvs/yast?rev=58273&view=rev Log: s390: correctly configure hsi devices (bnc#406091) Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/VERSION Tue Aug 4 14:52:38 2009 @@ -1 +1 @@ -2.13.132 +2.13.133 Modified: branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes Tue Aug 4 14:52:38 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 4 14:49:57 CEST 2009 - mzugec(a)suse.de + +- s390: correctly configure hsi devices (bnc#406091) +- 2.13.133 + +------------------------------------------------------------------- Thu Jun 25 15:36:09 CEST 2009 - mzugec(a)suse.de - for lcs and ctc offer only 2 CHAN_IDS (bnc#515492) Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp Tue Aug 4 14:52:38 2009 @@ -790,11 +790,11 @@ Lan::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); Lan::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } - else if (Lan::type != "hsi"){ + else //if (Lan::type != "hsi"){ Lan::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); // for ficon and escon devices configure chan_ids (#181998) if (contains(["ficon", "escon"], Lan::type)) Lan::qeth_chanids = (string) UI::QueryWidget(`id(`qeth_chanids), `Value); - } +// } if(Lan::type == "lcs") Lan::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value); Lan::qeth_chanids = (string) UI::QueryWidget(`id(`qeth_chanids), `Value); Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp Tue Aug 4 14:52:38 2009 @@ -306,10 +306,11 @@ if (Arch::s390()) { // handle HSI like qeth, S#40692#c15 - if (type == "hsi") - drvtype = "qeth"; + // if (type == "hsi") +// drvtype = "qeth"; // Should eth occur on s390? - else if (type == "tr" || type == "eth") +// else + if (type == "tr" || type == "eth") drvtype = "lcs"; // N#82891 else if (type == "escon" || type == "ficon") @@ -1300,7 +1301,8 @@ NetworkModules::SCRIPTUP = "hwup-ccw"; NetworkModules::SCRIPTUP_ccw = "hwup-ccw"; NetworkModules::SCRIPTDOWN = "hwdown-ccw"; - NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2; + if (type2=="hsi") NetworkModules::SCRIPTUP_ccwgroup = "hwup-qeth"; + else NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2; } /* integer devid = 0; @@ -1327,7 +1329,7 @@ NetworkModules::CCW_CHAN_NUM = "2"; NetworkModules::LCS_LANCMD_TIMEOUT = lcs_timeout; } - else if(type2 == "qeth") { + else if(type2 == "qeth"||type2 == "hsi") { NetworkModules::CCW_CHAN_IDS = qeth_chanids; //sformat("%1%2 %1%3 %1%4", devstr, devid0, devid1, devid2); NetworkModules::CCW_CHAN_MODE = chan_mode; NetworkModules::QETH_PORTNO = port_num; -- 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] r58272 - /trunk/printer/src/Printerlib.ycp
by jsmeix＠svn.opensuse.org 04 Aug '09

04 Aug '09

Author: jsmeix Date: Tue Aug 4 14:22:29 2009 New Revision: 58272 URL: http://svn.opensuse.org/viewcvs/yast?rev=58272&view=rev Log: In Printerlib::WaitForUpdatedConfigFiles replaced bumbling message "It takes 31 seconds until the config files are updated..." with "It takes half a minute until the config files are updated..." Modified: trunk/printer/src/Printerlib.ycp Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=5… ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Tue Aug 4 14:22:29 2009 @@ -547,8 +547,8 @@ sleep( 1000 ); return true; } - if( dirty_clean_interval < 31 ) - { // If 1 <= dirty_clean_interval <= 30 (30 is the default and fallback value) + if( dirty_clean_interval < 29 ) + { // If 1 <= dirty_clean_interval <= 28 // do not let the user interrupt the waiting for updated config files. // To be on the safe side sleep one second longer than the dirty_clean_interval: Popup::ShowFeedback( popupheader, @@ -564,6 +564,18 @@ Popup::ClearFeedback(); return true; } + if( dirty_clean_interval < 31 ) + { // If 29 <= dirty_clean_interval <= 30 (30 is the default and fallback value) + // do not let the user interrupt the waiting for updated config files. + // To be on the safe side sleep one second longer than the dirty_clean_interval: + Popup::ShowFeedback( popupheader, + // Message of a Popup::ShowFeedback. + _("It takes half a minute until the config files are updated...") + ); + sleep( ( 1000 * dirty_clean_interval ) + 1000 ); + Popup::ClearFeedback(); + return true; + } // If dirty_clean_interval > 30 let the user interrupt the waiting for updated config files // and return true if the user did not interrupt the waiting for updated config files // but return false if the user interrupted the waiting for updated config files. -- 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 : yast2-webservice.spec: require yast2-dbus-server package
by Ladislav Slezak 04 Aug '09

04 Aug '09

ref: refs/heads/master commit d3470945374d73cf5f1a8d06740ec2c4765c06ee Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Aug 4 14:14:56 2009 +0200 yast2-webservice.spec: require yast2-dbus-server package YaST DBus service has been moved from yast2-core to a separate package. --- webservice/package/yast2-webservice.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec index f741e9b..0f940ee 100644 --- a/webservice/package/yast2-webservice.spec +++ b/webservice/package/yast2-webservice.spec @@ -12,6 +12,7 @@ Name: yast2-webservice Requires: yast2-core >= 2.18.3, lighttpd-mod_magnet, ruby-fcgi, ruby-dbus, sqlite, avahi-utils Requires: rubygem-yast2-webservice-tasks +Requires: yast2-dbus-server # gamin gives problems with lighttpd, so better conflict with it for now Conflicts: gamin PreReq: lighttpd, PolicyKit, PackageKit, rubygem-rake, rubygem-sqlite3, rubygem-rails-2_3, ruby-rpam, ruby-polkit -- 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] r58271 - /trunk/storage/storage/src/modules/StorageProposal.ycp
by aschnell＠svn.opensuse.org 04 Aug '09

04 Aug '09

Author: aschnell Date: Tue Aug 4 13:47:50 2009 New Revision: 58271 URL: http://svn.opensuse.org/viewcvs/yast?rev=58271&view=rev Log: - stricter type Modified: trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Tue Aug 4 13:47:50 2009 @@ -171,13 +171,14 @@ } - map EncryptDevices(map<string, map> target, string vg) + global map<string, map> EncryptDevices(map<string, map> target, string vg) { if (!GetProposalLvm() || !GetProposalEncrypt()) return target; list<string> devices = target[vg, "devices_add"]:[]; - y2milestone("devices:%1", devices); + + y2milestone("vg:%1 devices:%2", vg, devices); // go through target map and set enc_type and password for all devices used by // our volume group @@ -187,6 +188,7 @@ string part_device = partition["device"]:""; if (contains(devices, part_device)) { + y2debug("setting encryption for %1", part_device); partition["enc_type"] = `luks; Storage::UpdateClassified(part_device, proposal_password); } -- 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 : document language model
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit 153b31627dd0176d7080beeec03da8cc9d8e4b81 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 13:26:26 2009 +0200 document language model --- plugins/language/app/models/language.rb | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/plugins/language/app/models/language.rb b/plugins/language/app/models/language.rb index ab90259..ae2df79 100644 --- a/plugins/language/app/models/language.rb +++ b/plugins/language/app/models/language.rb @@ -1,4 +1,9 @@ -class Language +# = Language model +# Provides set and gets resources from YaPI time module. +# Main goal is handle YaPI specific calls and data formats. Provide cleaned +# and well defined data. +class Language + # cache available languages as it is change only rarely @@available = {} attr_accessor :language, :utf8, @@ -13,6 +18,8 @@ class Language # dbus parsers # + # Parses response from dbus YaPI call + # response:: response from dbus def parse_response(response) @language = response["current"] @utf8 = response["utf8"] @@ -22,6 +29,9 @@ class Language end end + # Creates argument for dbus call which specify what data is requested. + # Available languages is cached so request it only if it is necessary. + # return:: hash with requested keys def create_read_question ret = { "current" => "true", @@ -40,14 +50,18 @@ class Language # public - def available + # Getter for available static field + def Language.available return @@available end + # fills language instance with data from YaPI. + # +warn+: Doesn't take any parameters and is not static. def find parse_response YastService.Call("YaPI::LANGUAGE::Read",create_read_question) end + # Saves data from model to system via YaPI def save settings = { "current" => @language, -- 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 : add doc:app rake task to include plugin test helper documentation, cannot find way how to do it better
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit e2623c44d40b64d2d64d0929b62271ef3ffa2d4d Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 13:25:53 2009 +0200 add doc:app rake task to include plugin test helper documentation, cannot find way how to do it better --- webservice/Rakefile | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/webservice/Rakefile b/webservice/Rakefile index 3bb0e85..567efeb 100644 --- a/webservice/Rakefile +++ b/webservice/Rakefile @@ -8,3 +8,18 @@ require 'rake/testtask' require 'rake/rdoctask' require 'tasks/rails' + +#include in doc:app also shared test enhancements for plugins +#FIXME find way how to change original rails task app:doc we only need include some files to it +namespace :doc do + Rake::RDocTask.new("app") { |rdoc| + rdoc.rdoc_dir = 'doc/app' + rdoc.title = "Rails Application Documentation" + rdoc.options << '--line-numbers' << '--inline-source' + rdoc.rdoc_files.include('doc/README_FOR_APP') + rdoc.rdoc_files.include('app/**/*.rb') + rdoc.rdoc_files.include('lib/**/*.rb') +#include shared test functionality in documentation + rdoc.rdoc_files.include('test/plugin_basic_tests.rb') + } +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] <rest-service> master : Patch controller - cache index result
by Ladislav Slezak 04 Aug '09

04 Aug '09

ref: refs/heads/master commit 09b4fd6f9e0329370173ef2176d2dcded93a4564 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Aug 4 13:00:57 2009 +0200 Patch controller - cache index result Caching patch index result saves about 4 seconds for each call --- .../patches/app/controllers/patches_controller.rb | 44 ++++++++++++++++++- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/plugins/patches/app/controllers/patches_controller.rb b/plugins/patches/app/controllers/patches_controller.rb index c0a3d9a..b72b3e4 100644 --- a/plugins/patches/app/controllers/patches_controller.rb +++ b/plugins/patches/app/controllers/patches_controller.rb @@ -47,6 +47,14 @@ end # class MainPkg class PatchesController < ApplicationController before_filter :login_required + + # always check permissions and cache expiration + # even if the result is already created and cached + before_filter :check_read_permissions, :only => :index + before_filter :check_cache_status, :only => :index + + # cache 'index' method result + caches_action :index #-------------------------------------------------------------------------------- # @@ -54,6 +62,37 @@ class PatchesController < ApplicationController # #-------------------------------------------------------------------------------- + private + + def check_read_permissions + unless permission_check( "org.opensuse.yast.system.patches.read") + render ErrorResult.error(403, 1, "no permission") and return + end + end + + # check whether the cached result is still valid + def check_cache_status + cache_timestamp = Rails.cache.read('patches:timestamp') + + if cache_timestamp.nil? + # this is the first run, the cache is not initialized yet, just return + Rails.cache.write('patches:timestamp', Time.now) + return + # the cache expires after 5 minutes, repository metadata + # or RPM database update invalidates the cache immeditely + # (new patches might be applicable) + elsif cache_timestamp < 5.minutes.ago || + cache_timestamp < File.stat("/var/lib/rpm/Packages").mtime || + cache_timestamp < File.stat("/var/cache/zypp/solv").mtime || + Dir["/var/cache/zypp/solv/*/solv"].find{ |x| File.stat(x).mtime > cache_timestamp} + logger.debug "#### Patch cache expired" + expire_action :action => :index, :format => params["format"] + Rails.cache.write('patches:timestamp', Time.now) + end + end + + public + def get_updateList patch_updates = [] system_bus = DBus::SystemBus.instance @@ -158,9 +197,8 @@ class PatchesController < ApplicationController # GET /patch_updates # GET /patch_updates.xml def index - unless permission_check( "org.opensuse.yast.system.patches.read") - render ErrorResult.error(403, 1, "no permission") and return - end + # note: permission check was performed in :before_filter + @patch_updates = get_updateList 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] r58270 - /trunk/audit-laf/src/helps.ycp
by gs＠svn.opensuse.org 04 Aug '09

04 Aug '09

Author: gs Date: Tue Aug 4 12:56:50 2009 New Revision: 58270 URL: http://svn.opensuse.org/viewcvs/yast?rev=58270&view=rev Log: missing added Modified: trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=5827… ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Tue Aug 4 12:56:50 2009 @@ -80,7 +80,7 @@ _("Configure the maximum log file size (in megabytes) and the action to take when this value is reached in Size and Action frame.") + /* logfile_settings dialog help 7/8 */ - _("If the action is set to ROTATE the Number of Log Files specifies the number + _("If the action is set to ROTATE the Number of Log Files specifies the number of files to keep. SYSLOG means: the audit daemon will write a warning to /var/log/messages, SUSPEND: stop writing records to disk, IGNORE: do nothing, KEEP_LOGS: similiar to ROTATE, but log files aren't overwritten.") + @@ -152,7 +152,7 @@ _("Enabling auditing whithout additional rules will cause the applications which use libaudit, e.g. PAM to log to /var/log/audit/audit.log (default). ") + /* rules dialog help 4/6 */ - _("The dialog also allows you to edit the rules manually, which is only recommended for advanced users. + _("The dialog also allows you to edit the rules manually, which is recommended for advanced users only. Detailed information about all options gives 'man auditctl'.") + /* rules dialog help 5/6 */ _("Check Syntax sends the rules via auditctl to the audit subsystem and tells -- 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] r58269 - /trunk/storage/storage/src/modules/StorageProposal.ycp
by aschnell＠svn.opensuse.org 04 Aug '09

04 Aug '09

Author: aschnell Date: Tue Aug 4 11:52:47 2009 New Revision: 58269 URL: http://svn.opensuse.org/viewcvs/yast?rev=58269&view=rev Log: - added some debugging output Modified: trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Tue Aug 4 11:52:47 2009 @@ -196,6 +196,8 @@ return $[ disk_device : data ]; }); + y2milestone("target:%1", target); + return target; } @@ -3820,8 +3822,8 @@ global map get_proposal_vm( map<string,map> target, string key, map disk ) { string ddev = disk["device"]:""; - y2milestone("get_proposal_vm ddev:%1 vg:%2 lvm:%3 home:%4", ddev, - key, GetProposalLvm(), GetProposalHome()); + y2milestone("get_proposal_vm ddev:%1 vg:%2 home:%3 lvm:%4 encrypt:%5", ddev, + key, GetProposalHome(), GetProposalLvm(), GetProposalEncrypt()); map ret = $[]; map opts = GetControlCfg(); target = remove_mount_points(target); -- 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 : remove debugger from code
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit 464055aebd1cd3f438587cba417b3bc8ce5935d6 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 10:55:22 2009 +0200 remove debugger from code --- .../app/controllers/language_controller.rb | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/plugins/language/app/controllers/language_controller.rb b/plugins/language/app/controllers/language_controller.rb index 157367a..ea90d67 100644 --- a/plugins/language/app/controllers/language_controller.rb +++ b/plugins/language/app/controllers/language_controller.rb @@ -22,7 +22,6 @@ class LanguageController < ApplicationController return false end -# debugger @valid = language.available.collect { |item| item.name } || [] @valid.sort! cur = language.available.find { |avail| avail.id.size>0 && avail.id == language.current } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0