November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59857 - /tags/branch-Code-11-2_17_28_2/users/
by jsuchome＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsuchome Date: Mon Nov 30 14:38:34 2009 New Revision: 59857 URL: http://svn.opensuse.org/viewcvs/yast?rev=59857&view=rev Log: Created tag branch-Code-11-2_17_28_2 for users Added: tags/branch-Code-11-2_17_28_2/users/ - copied from r59856, branches/SuSE-Code-11-Branch/users/ -- 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] r59856 - /tags/branch-Code-11-2_17_28_2/
by jsuchome＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsuchome Date: Mon Nov 30 14:38:30 2009 New Revision: 59856 URL: http://svn.opensuse.org/viewcvs/yast?rev=59856&view=rev Log: Created tag branch-Code-11-2_17_28_2 Added: tags/branch-Code-11-2_17_28_2/ -- 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] r59855 - in /branches/SuSE-Code-11-Branch/users: VERSION package/yast2-users.changes src/YaPI/ADMINISTRATOR.pm
by jsuchome＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsuchome Date: Mon Nov 30 14:37:27 2009 New Revision: 59855 URL: http://svn.opensuse.org/viewcvs/yast?rev=59855&view=rev Log: - YaPI: call newaliases after updating aliases (bnc#559135) - 2.17.28.2 Modified: branches/SuSE-Code-11-Branch/users/VERSION branches/SuSE-Code-11-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-Branch/users/src/YaPI/ADMINISTRATOR.pm Modified: branches/SuSE-Code-11-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/users/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-Branch/users/VERSION Mon Nov 30 14:37:27 2009 @@ -1 +1 @@ -2.17.28.1 +2.17.28.2 Modified: branches/SuSE-Code-11-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/users/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-Branch/users/package/yast2-users.changes Mon Nov 30 14:37:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 30 13:24:17 CET 2009 - jsuchome(a)suse.cz + +- YaPI: call newaliases after updating aliases (bnc#559135) +- 2.17.28.2 + +------------------------------------------------------------------- Tue Nov 10 11:00:58 CET 2009 - jsuchome(a)suse.cz - YaPI: added ADMINISTRATOR.pm (root password, mail aliases: Modified: branches/SuSE-Code-11-Branch/users/src/YaPI/ADMINISTRATOR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/users/src… ============================================================================== --- branches/SuSE-Code-11-Branch/users/src/YaPI/ADMINISTRATOR.pm (original) +++ branches/SuSE-Code-11-Branch/users/src/YaPI/ADMINISTRATOR.pm Mon Nov 30 14:37:27 2009 @@ -9,6 +9,7 @@ # ------------------- imported modules YaST::YCP::Import ("MailAliases"); YaST::YCP::Import ("Mode"); +YaST::YCP::Import ("SCR"); YaST::YCP::Import ("Users"); # ------------------------------------- @@ -80,6 +81,8 @@ $ret = __("An error occurred while setting forwarding for root's mail."); return $ret; } + my $out = SCR->Execute (".target.bash_output", "newaliases"); + $ret = $out->{"stderr"} || ""; } if ($args->{"password"}) { Users->SetRootPassword ($args->{"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] <web-client> master : disable ntp if not available (bnc#552071)
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/master commit f670adf638a13357645fca9c0399135a7de7c62a Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 14:11:38 2009 +0100 disable ntp if not available (bnc#552071) --- .../app/controllers/systemtime_controller.rb | 12 ++++++++++++ .../systemtime/app/views/systemtime/index.rhtml | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/plugins/systemtime/app/controllers/systemtime_controller.rb b/plugins/systemtime/app/controllers/systemtime_controller.rb index 1ad1e38..cd0dff3 100644 --- a/plugins/systemtime/app/controllers/systemtime_controller.rb +++ b/plugins/systemtime/app/controllers/systemtime_controller.rb @@ -36,6 +36,17 @@ class SystemtimeController < ApplicationController proxy.date = "" end + def available_ntp + begin + ntp = load_proxy 'org.opensuse.yast.modules.yapi.ntp' + rescue Exception => e #available call, so don't show anything, just log + logger.warn e + return false + end + return false unless ntp + return ntp.respond_to? :synchronize + end + public # cannot move to initialize, it is not finded - http://www.yotabanana.com/hiki/ruby-gettext-howto-rails.html#ApplicationCon… @@ -71,6 +82,7 @@ class SystemtimeController < ApplicationController @utcstatus = systemtime.utcstatus @time = systemtime.time @date = systemtime.date + @ntp = available_ntp fill_valid_timezones begin fill_current_region diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index 369899c..9589a22 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -67,7 +67,9 @@ </fieldset> <fieldset> <p> - <input type="radio" name="timeconfig" value="manual" onclick="enable();" id="timeconfig_manual"> + <input type="radio" name="timeconfig" value="manual" onclick="enable();" id="timeconfig_manual" + <%= "disabled=\"disabled\"" if disabled %> + > <%=_("Manually configure time")%> </p> <% #TODO for tooltip _("Manual time configuration table, where user selects data and time for target machine") @@ -81,7 +83,9 @@ <%= text_field_tag "currenttime", @time, :disabled=> "true"%> </p> <p> - <input id="timeconfig" type="radio" name="timeconfig" value="ntp_sync" onclick="disable();"> <%=_("Synchronize via Network Time Protocol (NTP)")%> + <input id="timeconfig" type="radio" name="timeconfig" value="ntp_sync" onclick="disable();" + <%= "disabled=\"disabled\"" if disabled || !@ntp %> + > <%=_("Synchronize via Network Time Protocol (NTP)")%> </p> </fieldset> <%= form_send_buttons :disabled => disabled, :class => "button" %> -- 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 : disable ntp if not available (bnc#552071)
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit f670adf638a13357645fca9c0399135a7de7c62a Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 14:11:38 2009 +0100 disable ntp if not available (bnc#552071) --- .../app/controllers/systemtime_controller.rb | 12 ++++++++++++ .../systemtime/app/views/systemtime/index.rhtml | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/plugins/systemtime/app/controllers/systemtime_controller.rb b/plugins/systemtime/app/controllers/systemtime_controller.rb index 1ad1e38..cd0dff3 100644 --- a/plugins/systemtime/app/controllers/systemtime_controller.rb +++ b/plugins/systemtime/app/controllers/systemtime_controller.rb @@ -36,6 +36,17 @@ class SystemtimeController < ApplicationController proxy.date = "" end + def available_ntp + begin + ntp = load_proxy 'org.opensuse.yast.modules.yapi.ntp' + rescue Exception => e #available call, so don't show anything, just log + logger.warn e + return false + end + return false unless ntp + return ntp.respond_to? :synchronize + end + public # cannot move to initialize, it is not finded - http://www.yotabanana.com/hiki/ruby-gettext-howto-rails.html#ApplicationCon… @@ -71,6 +82,7 @@ class SystemtimeController < ApplicationController @utcstatus = systemtime.utcstatus @time = systemtime.time @date = systemtime.date + @ntp = available_ntp fill_valid_timezones begin fill_current_region diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index 369899c..9589a22 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -67,7 +67,9 @@ </fieldset> <fieldset> <p> - <input type="radio" name="timeconfig" value="manual" onclick="enable();" id="timeconfig_manual"> + <input type="radio" name="timeconfig" value="manual" onclick="enable();" id="timeconfig_manual" + <%= "disabled=\"disabled\"" if disabled %> + > <%=_("Manually configure time")%> </p> <% #TODO for tooltip _("Manual time configuration table, where user selects data and time for target machine") @@ -81,7 +83,9 @@ <%= text_field_tag "currenttime", @time, :disabled=> "true"%> </p> <p> - <input id="timeconfig" type="radio" name="timeconfig" value="ntp_sync" onclick="disable();"> <%=_("Synchronize via Network Time Protocol (NTP)")%> + <input id="timeconfig" type="radio" name="timeconfig" value="ntp_sync" onclick="disable();" + <%= "disabled=\"disabled\"" if disabled || !@ntp %> + > <%=_("Synchronize via Network Time Protocol (NTP)")%> </p> </fieldset> <%= form_send_buttons :disabled => disabled, :class => "button" %> -- 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> fix_bnc552071 : fix definition of available call
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/fix_bnc552071 commit a69f53a2b6cadab9f72bf01503aaca7c13633c0c Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 12:59:07 2009 +0100 fix definition of available call --- plugins/ntp/package/NTP.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/ntp/package/NTP.pm b/plugins/ntp/package/NTP.pm index 332a606..da0aa3c 100644 --- a/plugins/ntp/package/NTP.pm +++ b/plugins/ntp/package/NTP.pm @@ -32,7 +32,7 @@ sub Synchronize { return $out.$ret; } -BEGIN{$TYPEINFO{Synchronize} = ["function", +BEGIN{$TYPEINFO{Available} = ["function", "boolean"]; } sub Available { -- 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 : fix definition of available call
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/master commit a69f53a2b6cadab9f72bf01503aaca7c13633c0c Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 12:59:07 2009 +0100 fix definition of available call --- plugins/ntp/package/NTP.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/ntp/package/NTP.pm b/plugins/ntp/package/NTP.pm index 332a606..da0aa3c 100644 --- a/plugins/ntp/package/NTP.pm +++ b/plugins/ntp/package/NTP.pm @@ -32,7 +32,7 @@ sub Synchronize { return $out.$ret; } -BEGIN{$TYPEINFO{Synchronize} = ["function", +BEGIN{$TYPEINFO{Available} = ["function", "boolean"]; } sub Available { -- 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> fix_bnc552071 : adapt policy file
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/fix_bnc552071 commit 0f5ccdf977212d93d49b1bf8954d23f87dc72e15 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 12:33:22 2009 +0100 adapt policy file --- .../org.opensuse.yast.modules.yapi.ntp.policy | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy b/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy index 8641500..91c40d9 100644 --- a/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy +++ b/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy @@ -16,4 +16,12 @@ </defaults> </action> + <action id="org.opensuse.yast.modules.yapi.ntp.available"> + <description>Test if ntp is available</description> + <message>Authentication is required to test if ntp is available</message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>no</allow_active> + </defaults> + </action> </policyconfig> -- 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 : adapt policy file
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/master commit 0f5ccdf977212d93d49b1bf8954d23f87dc72e15 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 12:33:22 2009 +0100 adapt policy file --- .../org.opensuse.yast.modules.yapi.ntp.policy | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy b/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy index 8641500..91c40d9 100644 --- a/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy +++ b/plugins/ntp/package/org.opensuse.yast.modules.yapi.ntp.policy @@ -16,4 +16,12 @@ </defaults> </action> + <action id="org.opensuse.yast.modules.yapi.ntp.available"> + <description>Test if ntp is available</description> + <message>Authentication is required to test if ntp is available</message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>no</allow_active> + </defaults> + </action> </policyconfig> -- 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 : allow synchronize action only if ntp is available (bnc#552071)
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/master commit 9861053de05483497cbe628ab08ce3b584201a9a Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 11:33:50 2009 +0100 allow synchronize action only if ntp is available (bnc#552071) --- plugins/ntp/app/models/ntp.rb | 6 ++++-- plugins/ntp/package/NTP.pm | 9 +++++++++ plugins/ntp/test/functional/ntp_controller_test.rb | 1 + plugins/ntp/test/unit/ntp_test.rb | 8 +++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/plugins/ntp/app/models/ntp.rb b/plugins/ntp/app/models/ntp.rb index c57115f..64c2b25 100644 --- a/plugins/ntp/app/models/ntp.rb +++ b/plugins/ntp/app/models/ntp.rb @@ -4,11 +4,13 @@ class Ntp public def initialize - @actions = { :synchronize => false } + @actions = Hash.new end def self.find - Ntp.new + ret =Ntp.new + ret.actions[:synchronize] = false if YastService.Call("YaPI::NTP::Available") + return ret end def save diff --git a/plugins/ntp/package/NTP.pm b/plugins/ntp/package/NTP.pm index e71acea..332a606 100644 --- a/plugins/ntp/package/NTP.pm +++ b/plugins/ntp/package/NTP.pm @@ -32,6 +32,15 @@ sub Synchronize { return $out.$ret; } +BEGIN{$TYPEINFO{Synchronize} = ["function", + "boolean"]; +} +sub Available { + my $self = shift; + return ((scalar @{getServers()}) != 0) && (getServers()->[0] ne "") +} + + sub getServers { my $servers = `grep "^[:space:]*NETCONFIG_NTP_STATIC_SERVERS" /etc/sysconfig/network/config | sed 's/.*="\$.*\$"/\\1/'`; my @serv = split(/\s+/,$servers); diff --git a/plugins/ntp/test/functional/ntp_controller_test.rb b/plugins/ntp/test/functional/ntp_controller_test.rb index 9709de5..db010eb 100644 --- a/plugins/ntp/test/functional/ntp_controller_test.rb +++ b/plugins/ntp/test/functional/ntp_controller_test.rb @@ -12,6 +12,7 @@ class SystemControllerTest < ActionController::TestCase @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures + YastService.stubs(:Call).with("YaPI::NTP::Available").returns(true) end diff --git a/plugins/ntp/test/unit/ntp_test.rb b/plugins/ntp/test/unit/ntp_test.rb index 2783e1f..e17c3fb 100644 --- a/plugins/ntp/test/unit/ntp_test.rb +++ b/plugins/ntp/test/unit/ntp_test.rb @@ -5,7 +5,8 @@ require 'system' class NtpTest < ActiveSupport::TestCase def setup - @model = Ntp.find + YastService.stubs(:Call).with("YaPI::NTP::Available").once.returns(true) + @model = Ntp.find end def test_actions @@ -40,4 +41,9 @@ class NtpTest < ActiveSupport::TestCase @model.save end end + + def test_unavailable_NTP + YastService.stubs(:Call).with("YaPI::NTP::Available").once.returns(false) + assert_equal nil, Ntp.find.actions[:synchronize] + 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