December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : systemtime: fix issue with super and utcstatus
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/master commit af27b8ed76c06580041427ad8f002c645b268825 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 14:33:46 2009 +0100 systemtime: fix issue with super and utcstatus super sometime doesn't work with included modules so I use alias utcstatus localtime use keywork local not localtime --- plugins/time/app/models/systemtime.rb | 6 ++++-- plugins/time/test/unit/systemtime_test.rb | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/time/app/models/systemtime.rb b/plugins/time/app/models/systemtime.rb index 0c715d7..fcf881d 100644 --- a/plugins/time/app/models/systemtime.rb +++ b/plugins/time/app/models/systemtime.rb @@ -60,7 +60,7 @@ class Systemtime < BaseModel::Base @utcstatus = case response["utcstatus"] when "UTC" then true - when "localtime" then false + when "local" then false when "UTCOnly" then nil else Rails.logger.warn "Unknown key in utcstatus #{response["utcstatus"]}" @@ -70,6 +70,8 @@ class Systemtime < BaseModel::Base @timezones = response["zones"] end +#super sometime doesn't work (need more investigation - in test work always, in real code sometime report no method in superclass) + alias orig_to_xml to_xml def to_xml(options={}) tmp =@timezones @timezones = @timezones.clone @@ -81,7 +83,7 @@ class Systemtime < BaseModel::Base end zone["entries"] = newentry end - res = super options + res = orig_to_xml options @timezones = tmp return res end diff --git a/plugins/time/test/unit/systemtime_test.rb b/plugins/time/test/unit/systemtime_test.rb index df11fae..9bf6407 100644 --- a/plugins/time/test/unit/systemtime_test.rb +++ b/plugins/time/test/unit/systemtime_test.rb @@ -38,18 +38,18 @@ class SystemtimeTest < ActiveSupport::TestCase WRITE_ARGUMENTS_NONE = { "timezone"=> "America/Kentucky/Monticello", - "utcstatus"=> "localtime" + "utcstatus"=> "local" } WRITE_ARGUMENTS_TIME = { "timezone"=> "America/Kentucky/Monticello", - "utcstatus"=> "localtime", + "utcstatus"=> "local", "time" => "2009-07-02 - 12:18:00" } WRITE_ARGUMENTS_NTP = { :timezone=> "America/Kentucky/Monticello", - :utcstatus=> "localtime", + :utcstatus=> "local", } def setup -- 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> jr-basemodel : fix generating messages for failed validations (don't use database information)
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/jr-basemodel commit ad7a15707f59db4682de57744ea9c297f1068927 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 13:22:30 2009 +0100 fix generating messages for failed validations (don't use database information) --- .../time/app/controllers/systemtime_controller.rb | 4 ++-- webservice/lib/base_model/base.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/time/app/controllers/systemtime_controller.rb b/plugins/time/app/controllers/systemtime_controller.rb index 2b3e7e2..b6826bf 100644 --- a/plugins/time/app/controllers/systemtime_controller.rb +++ b/plugins/time/app/controllers/systemtime_controller.rb @@ -38,8 +38,8 @@ class SystemtimeController < ApplicationController systemtime = Systemtime.find respond_to do |format| - format.xml { render :xml => systemtime.to_xml( :root => "systemtime", :dasherize => false ) } - format.json { render :json => systemtime.to_json( :root => "systemtime", :dasherize => false ) } + format.xml { render :xml => systemtime.to_xml( :dasherize => false ) } + format.json { render :json => systemtime.to_json( :dasherize => false ) } end end diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index 9ee6252..75ed3a7 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -128,5 +128,14 @@ module BaseModel include BaseModel::MassAssignment #serialization of models include BaseModel::Serialization + + end +end +#Hack to properly generate error message without ActiveRecord special methods +module ActiveRecord + class Error + def generate_message(message,options) + message + 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] <rest-service> master : fix generating messages for failed validations (don't use database information)
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/master commit ad7a15707f59db4682de57744ea9c297f1068927 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 13:22:30 2009 +0100 fix generating messages for failed validations (don't use database information) --- .../time/app/controllers/systemtime_controller.rb | 4 ++-- webservice/lib/base_model/base.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/time/app/controllers/systemtime_controller.rb b/plugins/time/app/controllers/systemtime_controller.rb index 2b3e7e2..b6826bf 100644 --- a/plugins/time/app/controllers/systemtime_controller.rb +++ b/plugins/time/app/controllers/systemtime_controller.rb @@ -38,8 +38,8 @@ class SystemtimeController < ApplicationController systemtime = Systemtime.find respond_to do |format| - format.xml { render :xml => systemtime.to_xml( :root => "systemtime", :dasherize => false ) } - format.json { render :json => systemtime.to_json( :root => "systemtime", :dasherize => false ) } + format.xml { render :xml => systemtime.to_xml( :dasherize => false ) } + format.json { render :json => systemtime.to_json( :dasherize => false ) } end end diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index 9ee6252..75ed3a7 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -128,5 +128,14 @@ module BaseModel include BaseModel::MassAssignment #serialization of models include BaseModel::Serialization + + end +end +#Hack to properly generate error message without ActiveRecord special methods +module ActiveRecord + class Error + def generate_message(message,options) + message + 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] <rest-service> jr-basemodel : time plugin now use base module
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/jr-basemodel commit 95cdbdd07a1b1d10cb5916fd7f59922e9ccc17f1 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 13:21:01 2009 +0100 time plugin now use base module --- .../time/app/controllers/systemtime_controller.rb | 4 +- plugins/time/app/models/systemtime.rb | 129 +++++++++----------- .../test/functional/systemtime_controller_test.rb | 37 +++++- plugins/time/test/unit/systemtime_test.rb | 51 +++----- 4 files changed, 109 insertions(+), 112 deletions(-) diff --git a/plugins/time/app/controllers/systemtime_controller.rb b/plugins/time/app/controllers/systemtime_controller.rb index 3eef247..2b3e7e2 100644 --- a/plugins/time/app/controllers/systemtime_controller.rb +++ b/plugins/time/app/controllers/systemtime_controller.rb @@ -16,14 +16,13 @@ class SystemtimeController < ApplicationController # Sets time settings. Requires write permissions for time YaPI. def update yapi_perm_check "time.write" - root = params[:systemtime] if root == nil logger.error "Response doesn't contain systemtime key" raise InvalidParameters.new :timezone => "Missing" end - systemtime = Systemtime.create_from_xml(root) + systemtime = Systemtime.new(root) systemtime.save show end @@ -36,7 +35,6 @@ class SystemtimeController < ApplicationController # Shows time settings. Requires read permission for time YaPI. def show yapi_perm_check "time.read" - systemtime = Systemtime.find respond_to do |format| diff --git a/plugins/time/app/models/systemtime.rb b/plugins/time/app/models/systemtime.rb index dd773c4..0c715d7 100644 --- a/plugins/time/app/models/systemtime.rb +++ b/plugins/time/app/models/systemtime.rb @@ -2,31 +2,48 @@ # Provides set and gets resources from YaPI time module. # Main goal is handle YaPI specific calls and data formats. Provides cleaned # and well defined data. -class Systemtime - - @@timezones = Array.new() +class Systemtime < BaseModel::Base # Date settings format is dd/mm/yyyy attr_accessor :date + validates_format_of :date, :with => /^\d{2}\/\d{2}\/\d{4}$/, :allow_nil => true # time settings format is hh:mm:ss attr_accessor :time + validates_format_of :time, :with => /^\d{2}:\d{2}:\d{2}$/, :allow_nil => true # Current timezone as id attr_accessor :timezone + #check if zone exists + validates_each :timezone, :allow_nil => true do |model,attr,zone| + contain = false + unless model.timezones.nil? + model.timezones.each do |z| + contain = true if z["entries"][zone] + end + model.errors.add attr, "Unknown timezone" unless contain + end + end # Utc status possible values is UTCOnly, UTC and localtime see yast2-country doc attr_accessor :utcstatus + validates_inclusion_of :utcstatus, :in => [true,false], :allow_nil => true + attr_accessor :timezones + validates_presence_of :timezones + # do not massload timezones, as it is read-only + attr_protected :timezones + + after_save :restart_collectd private # Creates argument for dbus call which specify what data is requested. # Available timezones is cached so request it only if it is necessary. # return:: hash with requested keys - def Systemtime.create_read_question #:doc: + def self.create_read_question #:doc: ret = { "timezone" => "true", "utcstatus" => "true", - "currenttime" => "true" + "currenttime" => "true", + "zones" => "true" } - ret["zones"]= @@timezones.empty? ? "true" : "false" return ret end @@ -40,34 +57,39 @@ class Systemtime @date = timedate[0..timedate.index(" - ")-1] #convert date to format for datepicker @date.sub!(/^(\d+)-(\d+)-(\d+)/,'\3/\2/\1') - @utcstatus= response["utcstatus"] - @timezone = response["timezone"] - if response["zones"] - @@timezones = response["zones"] + @utcstatus = + case response["utcstatus"] + when "UTC" then true + when "localtime" then false + when "UTCOnly" then nil + else + Rails.logger.warn "Unknown key in utcstatus #{response["utcstatus"]}" + nil #set nill, maybe exception??? end + @timezone = response["timezone"] + @timezones = response["zones"] end - #Getter for static timezones - def Systemtime.timezones - return @@timezones - end - - def Systemtime.create_from_xml(xmlroot) - systemtime = Systemtime.new - systemtime.time = xmlroot[:time] - systemtime.date = xmlroot[:date] - systemtime.timezone = xmlroot[:timezone] - systemtime.utcstatus = xmlroot[:utcstatus] - return systemtime - end - - def initialize + def to_xml(options={}) + tmp =@timezones + @timezones = @timezones.clone + #transform hash before serialization + @timezones.each do |zone| + newentry = [] + zone["entries"].each do |k,v| + newentry << { "id" => k, "name" => v } + end + zone["entries"] = newentry + end + res = super options + @timezones = tmp + return res end # fills time instance with data from YaPI. # # +warn+: Doesn't take any parameters. - def Systemtime.find + def self.find ret = Systemtime.new() ret.parse_response YastService.Call("YaPI::TIME::Read",create_read_question) return ret @@ -75,17 +97,14 @@ class Systemtime # Saves data from model to system via YaPI. Saves only setted data, # so it support partial safe (e.g. save only new timezone if rest of fields is not set). - def save + def update settings = {} RAILS_DEFAULT_LOGGER.info "called write with #{settings.inspect}" - if @timezone and !(a)timezone.empty? - settings["timezone"] = @timezone + settings["timezone"] = @timezone unless @timezone.blank? + unless @utcstatus.nil? + settings["utcstatus"] = @utcstatus ? "UTC" : "localtime" end - if @utcstatus and !(a)utcstatus.empty? - settings["utcstatus"] = @utcstatus - end - if (@date and !(a)date.empty?) and - (@time and !(a)time.empty?) + unless @date.blank? || @time.blank? date = @date.split("/") datetime = "#{date[2]}-#{date[0]}-#{date[1]} - "+@time settings["currenttime"] = datetime @@ -100,6 +119,9 @@ class Systemtime #XXX hack to avoid dbus timeout durign moving time to future #FIXME use correct exception end + end + + def restart_collectd #restart collectd as moving in time confuse status module (bnc#557929) begin ret = YastService.Call("YaPI::SERVICES::Execute",{ @@ -111,43 +133,6 @@ class Systemtime Rails.logger.warn "Exception thrown by DBus while restarting collectd #{e.inspect}" #restarting collectd is optional, so it should not do anything end - - end - - def to_xml( options = {} ) - xml = options[:builder] ||= Builder::XmlMarkup.new(options) - xml.instruct! unless options[:skip_instruct] - - xml.systemtime do - xml.time @time - xml.date @date - xml.timezone @timezone - xml.utcstatus @utcstatus - xml.timezones({:type => "array"}) do - @@timezones.each do |region| - if not region.empty? - xml.region do - xml.name region["name"] - xml.central region["central"] - xml.entries({:type => "array"}) do - region["entries"].each do |id,name| - xml.timezone do - xml.id id - xml.name name - end - end - end - - end - end - end - end - end + true end - - def to_json( options = {} ) - hash = Hash.from_xml(to_xml()) - return hash.to_json - end - end diff --git a/plugins/time/test/functional/systemtime_controller_test.rb b/plugins/time/test/functional/systemtime_controller_test.rb index bddd2de..382ca26 100644 --- a/plugins/time/test/functional/systemtime_controller_test.rb +++ b/plugins/time/test/functional/systemtime_controller_test.rb @@ -6,15 +6,39 @@ require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.pa class SystemtimeControllerTest < ActionController::TestCase fixtures :accounts + INITIAL_DATA = { + :timezone => "Europe/Prague", + :time => "12:18:00", + :date => "02/07/2009", + :utcstatus => "true" } + TEST_TIMEZONES = [{ + "name" => "Europe", + "central" => "Europe/Prague", + "entries" => { + "Europe/Prague" => "Czech Republic", + "Europe/Kiev" => "Ukraine (Kiev)" + } + }, + { + "name" => "USA", + "central" => "America/Chicago", + "entries" => { + "America/Chicago" => "Central (Chicago)", + "America/Kentucky/Monticello" => "Kentucky (Monticello)" + } + } + ] DATA = {:systemtime => { :timezone => "Europe/Prague", :utcstatus => "true" }} def setup - @model_class = Systemtime + @model_class = Systemtime - Systemtime.stubs(:find).returns(Systemtime.new) + time_mock = Systemtime.new(INITIAL_DATA) + time_mock.timezones = TEST_TIMEZONES + Systemtime.stubs(:find).returns(time_mock) @controller = SystemtimeController.new @request = ActionController::TestRequest.new @@ -40,10 +64,13 @@ class SystemtimeControllerTest < ActionController::TestCase def mock_save YastService.stubs(:Call).with { |params,settings| - params == "YaPI::TIME::Write" and - settings["timezone"] == DATA[:systemtime][:timezone] and - settings["utcstatus"] == DATA[:systemtime][:utcstatus] and + ret = params == "YaPI::TIME::Write" && + settings["timezone"] == DATA[:systemtime][:timezone] && + settings["utcstatus"] == DATA[:systemtime][:utcstatus] && ! settings.include?("currenttime") + ret2 = params == "YaPI::SERVICES::Execute" + return ret || ret2 } + Systemtime.stubs(:permission_check) end end diff --git a/plugins/time/test/unit/systemtime_test.rb b/plugins/time/test/unit/systemtime_test.rb index 4f8fb4e..df11fae 100644 --- a/plugins/time/test/unit/systemtime_test.rb +++ b/plugins/time/test/unit/systemtime_test.rb @@ -32,28 +32,29 @@ class SystemtimeTest < ActiveSupport::TestCase READ_RESPONSE = { "zones"=> TEST_TIMEZONES, "timezone"=> "Europe/Prague", - "utcstatus"=> "true", + "utcstatus"=> "UTC", "time" => "2009-07-02 - 12:18:00" } WRITE_ARGUMENTS_NONE = { "timezone"=> "America/Kentucky/Monticello", - "utcstatus"=> "false" + "utcstatus"=> "localtime" } WRITE_ARGUMENTS_TIME = { "timezone"=> "America/Kentucky/Monticello", - "utcstatus"=> "false", + "utcstatus"=> "localtime", "time" => "2009-07-02 - 12:18:00" } WRITE_ARGUMENTS_NTP = { :timezone=> "America/Kentucky/Monticello", - :utcstatus=> "false", + :utcstatus=> "localtime", } def setup @model = Systemtime.new + Systemtime.stubs(:permission_check) end @@ -61,11 +62,11 @@ class SystemtimeTest < ActiveSupport::TestCase YastService.stubs(:Call).with("YaPI::TIME::Read",READ_ARGUMENTS).returns(READ_RESPONSE) @model = Systemtime.find - assert_equal("02/07/2009", @model.date) - assert_equal("12:18:00", @model.time) - assert_equal("Europe/Prague", @model.timezone) - assert_equal("true", @model.utcstatus) - assert_equal(TEST_TIMEZONES,Systemtime.timezones) + assert_equal "02/07/2009", @model.date + assert_equal "12:18:00", @model.time + assert_equal "Europe/Prague", @model.timezone + assert_equal true, @model.utcstatus + assert_equal TEST_TIMEZONES, @model.timezones end def test_setter_without_time @@ -77,8 +78,9 @@ class SystemtimeTest < ActiveSupport::TestCase }).once @model.timezone = "America/Kentucky/Monticello" - @model.utcstatus = "false" - @model.save + @model.utcstatus = false + @model.timezones = TEST_TIMEZONES + assert @model.save, "Errors during saving: "+(a)model.errors.collect{ |e| e.inspect}.join("\n") end def test_setter_with_time @@ -90,10 +92,11 @@ class SystemtimeTest < ActiveSupport::TestCase }).once @model.timezone = "America/Kentucky/Monticello" - @model.utcstatus = "false" + @model.utcstatus = false @model.date = "02/07/2009" @model.time = "12:18:00" - @model.save + @model.timezones = TEST_TIMEZONES + assert @model.save, "Errors during saving: "+(a)model.errors.collect{ |e| e.inspect}.join("\n") end def test_setter_with_move_to_future @@ -109,19 +112,16 @@ class SystemtimeTest < ActiveSupport::TestCase }).once @model.timezone = "America/Kentucky/Monticello" - @model.utcstatus = "false" + @model.utcstatus = false @model.date = "02/07/2009" @model.time = "12:18:00" + @model.timezones = TEST_TIMEZONES assert_nothing_raised do - @model.save + assert @model.save, "Errors during saving: "+(a)model.errors.collect{ |e| e.inspect}.join("\n") end end def test_xml - #inject Timezones to set available timezone for direct testing - def @model.timezones=(val) - @@timezones=val - end data = READ_RESPONSE @model.timezone = data["timezone"] @@ -139,24 +139,11 @@ class SystemtimeTest < ActiveSupport::TestCase assert_equal("02/07/2009", response["date"]) zone_response = TEST_TIMEZONES - zone_response.each { |zone| - entries = [] - zone["entries"].each { |k,v| - entries.push({"id"=>k,"name"=>v}) - } - zone["entries"] = entries - } - assert_equal(zone_response.sort { |a,b| a["name"] <=> b["name"] }, response["timezones"].sort { |a,b| a["name"] <=> b["name"] }) end def test_json - #inject Timezones to set available timezone for direct testing - def @model.timezones=(val) - @@timezones=val - end - data = READ_RESPONSE @model.timezone = data["timezone"] -- 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 : time plugin now use base module
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/master commit 95cdbdd07a1b1d10cb5916fd7f59922e9ccc17f1 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 13:21:01 2009 +0100 time plugin now use base module --- .../time/app/controllers/systemtime_controller.rb | 4 +- plugins/time/app/models/systemtime.rb | 129 +++++++++----------- .../test/functional/systemtime_controller_test.rb | 37 +++++- plugins/time/test/unit/systemtime_test.rb | 51 +++----- 4 files changed, 109 insertions(+), 112 deletions(-) diff --git a/plugins/time/app/controllers/systemtime_controller.rb b/plugins/time/app/controllers/systemtime_controller.rb index 3eef247..2b3e7e2 100644 --- a/plugins/time/app/controllers/systemtime_controller.rb +++ b/plugins/time/app/controllers/systemtime_controller.rb @@ -16,14 +16,13 @@ class SystemtimeController < ApplicationController # Sets time settings. Requires write permissions for time YaPI. def update yapi_perm_check "time.write" - root = params[:systemtime] if root == nil logger.error "Response doesn't contain systemtime key" raise InvalidParameters.new :timezone => "Missing" end - systemtime = Systemtime.create_from_xml(root) + systemtime = Systemtime.new(root) systemtime.save show end @@ -36,7 +35,6 @@ class SystemtimeController < ApplicationController # Shows time settings. Requires read permission for time YaPI. def show yapi_perm_check "time.read" - systemtime = Systemtime.find respond_to do |format| diff --git a/plugins/time/app/models/systemtime.rb b/plugins/time/app/models/systemtime.rb index dd773c4..0c715d7 100644 --- a/plugins/time/app/models/systemtime.rb +++ b/plugins/time/app/models/systemtime.rb @@ -2,31 +2,48 @@ # Provides set and gets resources from YaPI time module. # Main goal is handle YaPI specific calls and data formats. Provides cleaned # and well defined data. -class Systemtime - - @@timezones = Array.new() +class Systemtime < BaseModel::Base # Date settings format is dd/mm/yyyy attr_accessor :date + validates_format_of :date, :with => /^\d{2}\/\d{2}\/\d{4}$/, :allow_nil => true # time settings format is hh:mm:ss attr_accessor :time + validates_format_of :time, :with => /^\d{2}:\d{2}:\d{2}$/, :allow_nil => true # Current timezone as id attr_accessor :timezone + #check if zone exists + validates_each :timezone, :allow_nil => true do |model,attr,zone| + contain = false + unless model.timezones.nil? + model.timezones.each do |z| + contain = true if z["entries"][zone] + end + model.errors.add attr, "Unknown timezone" unless contain + end + end # Utc status possible values is UTCOnly, UTC and localtime see yast2-country doc attr_accessor :utcstatus + validates_inclusion_of :utcstatus, :in => [true,false], :allow_nil => true + attr_accessor :timezones + validates_presence_of :timezones + # do not massload timezones, as it is read-only + attr_protected :timezones + + after_save :restart_collectd private # Creates argument for dbus call which specify what data is requested. # Available timezones is cached so request it only if it is necessary. # return:: hash with requested keys - def Systemtime.create_read_question #:doc: + def self.create_read_question #:doc: ret = { "timezone" => "true", "utcstatus" => "true", - "currenttime" => "true" + "currenttime" => "true", + "zones" => "true" } - ret["zones"]= @@timezones.empty? ? "true" : "false" return ret end @@ -40,34 +57,39 @@ class Systemtime @date = timedate[0..timedate.index(" - ")-1] #convert date to format for datepicker @date.sub!(/^(\d+)-(\d+)-(\d+)/,'\3/\2/\1') - @utcstatus= response["utcstatus"] - @timezone = response["timezone"] - if response["zones"] - @@timezones = response["zones"] + @utcstatus = + case response["utcstatus"] + when "UTC" then true + when "localtime" then false + when "UTCOnly" then nil + else + Rails.logger.warn "Unknown key in utcstatus #{response["utcstatus"]}" + nil #set nill, maybe exception??? end + @timezone = response["timezone"] + @timezones = response["zones"] end - #Getter for static timezones - def Systemtime.timezones - return @@timezones - end - - def Systemtime.create_from_xml(xmlroot) - systemtime = Systemtime.new - systemtime.time = xmlroot[:time] - systemtime.date = xmlroot[:date] - systemtime.timezone = xmlroot[:timezone] - systemtime.utcstatus = xmlroot[:utcstatus] - return systemtime - end - - def initialize + def to_xml(options={}) + tmp =@timezones + @timezones = @timezones.clone + #transform hash before serialization + @timezones.each do |zone| + newentry = [] + zone["entries"].each do |k,v| + newentry << { "id" => k, "name" => v } + end + zone["entries"] = newentry + end + res = super options + @timezones = tmp + return res end # fills time instance with data from YaPI. # # +warn+: Doesn't take any parameters. - def Systemtime.find + def self.find ret = Systemtime.new() ret.parse_response YastService.Call("YaPI::TIME::Read",create_read_question) return ret @@ -75,17 +97,14 @@ class Systemtime # Saves data from model to system via YaPI. Saves only setted data, # so it support partial safe (e.g. save only new timezone if rest of fields is not set). - def save + def update settings = {} RAILS_DEFAULT_LOGGER.info "called write with #{settings.inspect}" - if @timezone and !(a)timezone.empty? - settings["timezone"] = @timezone + settings["timezone"] = @timezone unless @timezone.blank? + unless @utcstatus.nil? + settings["utcstatus"] = @utcstatus ? "UTC" : "localtime" end - if @utcstatus and !(a)utcstatus.empty? - settings["utcstatus"] = @utcstatus - end - if (@date and !(a)date.empty?) and - (@time and !(a)time.empty?) + unless @date.blank? || @time.blank? date = @date.split("/") datetime = "#{date[2]}-#{date[0]}-#{date[1]} - "+@time settings["currenttime"] = datetime @@ -100,6 +119,9 @@ class Systemtime #XXX hack to avoid dbus timeout durign moving time to future #FIXME use correct exception end + end + + def restart_collectd #restart collectd as moving in time confuse status module (bnc#557929) begin ret = YastService.Call("YaPI::SERVICES::Execute",{ @@ -111,43 +133,6 @@ class Systemtime Rails.logger.warn "Exception thrown by DBus while restarting collectd #{e.inspect}" #restarting collectd is optional, so it should not do anything end - - end - - def to_xml( options = {} ) - xml = options[:builder] ||= Builder::XmlMarkup.new(options) - xml.instruct! unless options[:skip_instruct] - - xml.systemtime do - xml.time @time - xml.date @date - xml.timezone @timezone - xml.utcstatus @utcstatus - xml.timezones({:type => "array"}) do - @@timezones.each do |region| - if not region.empty? - xml.region do - xml.name region["name"] - xml.central region["central"] - xml.entries({:type => "array"}) do - region["entries"].each do |id,name| - xml.timezone do - xml.id id - xml.name name - end - end - end - - end - end - end - end - end + true end - - def to_json( options = {} ) - hash = Hash.from_xml(to_xml()) - return hash.to_json - end - end diff --git a/plugins/time/test/functional/systemtime_controller_test.rb b/plugins/time/test/functional/systemtime_controller_test.rb index bddd2de..382ca26 100644 --- a/plugins/time/test/functional/systemtime_controller_test.rb +++ b/plugins/time/test/functional/systemtime_controller_test.rb @@ -6,15 +6,39 @@ require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.pa class SystemtimeControllerTest < ActionController::TestCase fixtures :accounts + INITIAL_DATA = { + :timezone => "Europe/Prague", + :time => "12:18:00", + :date => "02/07/2009", + :utcstatus => "true" } + TEST_TIMEZONES = [{ + "name" => "Europe", + "central" => "Europe/Prague", + "entries" => { + "Europe/Prague" => "Czech Republic", + "Europe/Kiev" => "Ukraine (Kiev)" + } + }, + { + "name" => "USA", + "central" => "America/Chicago", + "entries" => { + "America/Chicago" => "Central (Chicago)", + "America/Kentucky/Monticello" => "Kentucky (Monticello)" + } + } + ] DATA = {:systemtime => { :timezone => "Europe/Prague", :utcstatus => "true" }} def setup - @model_class = Systemtime + @model_class = Systemtime - Systemtime.stubs(:find).returns(Systemtime.new) + time_mock = Systemtime.new(INITIAL_DATA) + time_mock.timezones = TEST_TIMEZONES + Systemtime.stubs(:find).returns(time_mock) @controller = SystemtimeController.new @request = ActionController::TestRequest.new @@ -40,10 +64,13 @@ class SystemtimeControllerTest < ActionController::TestCase def mock_save YastService.stubs(:Call).with { |params,settings| - params == "YaPI::TIME::Write" and - settings["timezone"] == DATA[:systemtime][:timezone] and - settings["utcstatus"] == DATA[:systemtime][:utcstatus] and + ret = params == "YaPI::TIME::Write" && + settings["timezone"] == DATA[:systemtime][:timezone] && + settings["utcstatus"] == DATA[:systemtime][:utcstatus] && ! settings.include?("currenttime") + ret2 = params == "YaPI::SERVICES::Execute" + return ret || ret2 } + Systemtime.stubs(:permission_check) end end diff --git a/plugins/time/test/unit/systemtime_test.rb b/plugins/time/test/unit/systemtime_test.rb index 4f8fb4e..df11fae 100644 --- a/plugins/time/test/unit/systemtime_test.rb +++ b/plugins/time/test/unit/systemtime_test.rb @@ -32,28 +32,29 @@ class SystemtimeTest < ActiveSupport::TestCase READ_RESPONSE = { "zones"=> TEST_TIMEZONES, "timezone"=> "Europe/Prague", - "utcstatus"=> "true", + "utcstatus"=> "UTC", "time" => "2009-07-02 - 12:18:00" } WRITE_ARGUMENTS_NONE = { "timezone"=> "America/Kentucky/Monticello", - "utcstatus"=> "false" + "utcstatus"=> "localtime" } WRITE_ARGUMENTS_TIME = { "timezone"=> "America/Kentucky/Monticello", - "utcstatus"=> "false", + "utcstatus"=> "localtime", "time" => "2009-07-02 - 12:18:00" } WRITE_ARGUMENTS_NTP = { :timezone=> "America/Kentucky/Monticello", - :utcstatus=> "false", + :utcstatus=> "localtime", } def setup @model = Systemtime.new + Systemtime.stubs(:permission_check) end @@ -61,11 +62,11 @@ class SystemtimeTest < ActiveSupport::TestCase YastService.stubs(:Call).with("YaPI::TIME::Read",READ_ARGUMENTS).returns(READ_RESPONSE) @model = Systemtime.find - assert_equal("02/07/2009", @model.date) - assert_equal("12:18:00", @model.time) - assert_equal("Europe/Prague", @model.timezone) - assert_equal("true", @model.utcstatus) - assert_equal(TEST_TIMEZONES,Systemtime.timezones) + assert_equal "02/07/2009", @model.date + assert_equal "12:18:00", @model.time + assert_equal "Europe/Prague", @model.timezone + assert_equal true, @model.utcstatus + assert_equal TEST_TIMEZONES, @model.timezones end def test_setter_without_time @@ -77,8 +78,9 @@ class SystemtimeTest < ActiveSupport::TestCase }).once @model.timezone = "America/Kentucky/Monticello" - @model.utcstatus = "false" - @model.save + @model.utcstatus = false + @model.timezones = TEST_TIMEZONES + assert @model.save, "Errors during saving: "+(a)model.errors.collect{ |e| e.inspect}.join("\n") end def test_setter_with_time @@ -90,10 +92,11 @@ class SystemtimeTest < ActiveSupport::TestCase }).once @model.timezone = "America/Kentucky/Monticello" - @model.utcstatus = "false" + @model.utcstatus = false @model.date = "02/07/2009" @model.time = "12:18:00" - @model.save + @model.timezones = TEST_TIMEZONES + assert @model.save, "Errors during saving: "+(a)model.errors.collect{ |e| e.inspect}.join("\n") end def test_setter_with_move_to_future @@ -109,19 +112,16 @@ class SystemtimeTest < ActiveSupport::TestCase }).once @model.timezone = "America/Kentucky/Monticello" - @model.utcstatus = "false" + @model.utcstatus = false @model.date = "02/07/2009" @model.time = "12:18:00" + @model.timezones = TEST_TIMEZONES assert_nothing_raised do - @model.save + assert @model.save, "Errors during saving: "+(a)model.errors.collect{ |e| e.inspect}.join("\n") end end def test_xml - #inject Timezones to set available timezone for direct testing - def @model.timezones=(val) - @@timezones=val - end data = READ_RESPONSE @model.timezone = data["timezone"] @@ -139,24 +139,11 @@ class SystemtimeTest < ActiveSupport::TestCase assert_equal("02/07/2009", response["date"]) zone_response = TEST_TIMEZONES - zone_response.each { |zone| - entries = [] - zone["entries"].each { |k,v| - entries.push({"id"=>k,"name"=>v}) - } - zone["entries"] = entries - } - assert_equal(zone_response.sort { |a,b| a["name"] <=> b["name"] }, response["timezones"].sort { |a,b| a["name"] <=> b["name"] }) end def test_json - #inject Timezones to set available timezone for direct testing - def @model.timezones=(val) - @@timezones=val - end - data = READ_RESPONSE @model.timezone = data["timezone"] -- 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] r60091 - in /branches/SuSE-SLE-10-SP3-Branch/restore: package/yast2-restore.changes src/ui.ycp
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 11:16:59 2009 New Revision: 60091 URL: http://svn.opensuse.org/viewcvs/yast?rev=60091&view=rev Log: - Fixed restoration of unavailable packages (bnc #553400). - Fixed dialog for selecting packages to restore (bnc #553400). Modified: branches/SuSE-SLE-10-SP3-Branch/restore/package/yast2-restore.changes branches/SuSE-SLE-10-SP3-Branch/restore/src/ui.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/restor… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/restore/package/yast2-restore.changes Mon Dec 14 11:16:59 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 14 11:12:13 CET 2009 - locilka(a)suse.cz + +- Fixed restoration of unavailable packages (bnc #553400). +- Fixed dialog for selecting packages to restore (bnc #553400). + +------------------------------------------------------------------- Mon Mar 10 09:08:23 CET 2008 - locilka(a)suse.cz - Fixed restoration in autoyast (#199657). Modified: branches/SuSE-SLE-10-SP3-Branch/restore/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/restor… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/restore/src/ui.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/restore/src/ui.ycp Mon Dec 14 11:16:59 2009 @@ -29,8 +29,10 @@ import "URL"; import "Popup"; +import "Report"; import "Label"; import "Package"; +import "PackageSystem"; import "Sequencer"; include "restore/helps.ycp"; @@ -1231,9 +1233,53 @@ y2milestone("install: %1", install); y2milestone("uninstall: %1", uninstall); + list <string> unavailable_packages = []; + + // Initialize the package manager (the same way it is used later) + // before checking for packages availability + PackageSystem::EnsureSourceInit(); + + // BNC #553400: Checking for all packages to install whether they are available + foreach (string one_package, install, { + // Package is not available - cannot be installed + if (Pkg::IsAvailable (one_package) != true) { + if (Popup::AnyQuestion ( + // Headline + _("Error"), + // Error message + sformat(_("Package %1 is not available on any of the subscribed repositories. +Would you like to got back and unselect the package or skip it?"), one_package), + _("Yes, Go &Back"), + _("&Skip"), + `focus_yes + )) { + y2milestone ("User has decided to go back an unselect the package (%1)", one_package); + lastret = `back; + break; + } else { + unavailable_packages = add (unavailable_packages, one_package); + y2warning ("User decided to skip missing package (%1)", one_package); + } + } + }); + + // Remove all unavailable packages from list of packages to install + foreach (string do_not_install_package, unavailable_packages, { + install = filter (string one_package, install, { + return (one_package != do_not_install_package); + }); + }); + + if (lastret == `back) + { + return `back; + } + if (size(install) > 0 || size(uninstall) > 0) { - Package::DoInstallAndRemove(install, uninstall); + if (Package::DoInstallAndRemove(install, uninstall) != true) { + Report::Error (_("Installation or removal of some packages has failed.")); + } Restore::ReadActualInstalledPackages(); } @@ -1366,7 +1412,11 @@ if (RPMoption == nil) { - RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + // BNC #553400, Comment #19: Use the proposed 'Restore RPM DB' only if proposal is valid + if (haskey(proposedRPMrestoration, "proposed") && proposedRPMrestoration["proposed"]:false != nil) + RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + else + RPMoption = false; } y2warning("RPMoption: %1", RPMoption); -- 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] r60090 - in /trunk/restore: package/yast2-restore.changes src/ui.ycp
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 11:16:38 2009 New Revision: 60090 URL: http://svn.opensuse.org/viewcvs/yast?rev=60090&view=rev Log: - Fixed restoration of unavailable packages (bnc #553400). - Fixed dialog for selecting packages to restore (bnc #553400). Modified: trunk/restore/package/yast2-restore.changes trunk/restore/src/ui.ycp Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.ch… ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Mon Dec 14 11:16:38 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 14 11:12:13 CET 2009 - locilka(a)suse.cz + +- Fixed restoration of unavailable packages (bnc #553400). +- Fixed dialog for selecting packages to restore (bnc #553400). + +------------------------------------------------------------------- Wed Jun 24 15:49:19 CEST 2009 - locilka(a)suse.cz - Fixed 'Archive Properties' scrolling (bnc #459657). Modified: trunk/restore/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/ui.ycp?rev=60090&r1=… ============================================================================== --- trunk/restore/src/ui.ycp (original) +++ trunk/restore/src/ui.ycp Mon Dec 14 11:16:38 2009 @@ -29,8 +29,10 @@ import "URL"; import "Popup"; +import "Report"; import "Label"; import "Package"; +import "PackageSystem"; import "Sequencer"; include "restore/helps.ycp"; @@ -1232,9 +1234,53 @@ y2milestone("install: %1", install); y2milestone("uninstall: %1", uninstall); + list <string> unavailable_packages = []; + + // Initialize the package manager (the same way it is used later) + // before checking for packages availability + PackageSystem::EnsureSourceInit(); + + // BNC #553400: Checking for all packages to install whether they are available + foreach (string one_package, install, { + // Package is not available - cannot be installed + if (Pkg::IsAvailable (one_package) != true) { + if (Popup::AnyQuestion ( + // Headline + _("Error"), + // Error message + sformat(_("Package %1 is not available on any of the subscribed repositories. +Would you like to got back and unselect the package or skip it?"), one_package), + _("Yes, Go &Back"), + _("&Skip"), + `focus_yes + )) { + y2milestone ("User has decided to go back an unselect the package (%1)", one_package); + lastret = `back; + break; + } else { + unavailable_packages = add (unavailable_packages, one_package); + y2warning ("User decided to skip missing package (%1)", one_package); + } + } + }); + + // Remove all unavailable packages from list of packages to install + foreach (string do_not_install_package, unavailable_packages, { + install = filter (string one_package, install, { + return (one_package != do_not_install_package); + }); + }); + + if (lastret == `back) + { + return `back; + } + if (size(install) > 0 || size(uninstall) > 0) { - Package::DoInstallAndRemove(install, uninstall); + if (Package::DoInstallAndRemove(install, uninstall) != true) { + Report::Error (_("Installation or removal of some packages has failed.")); + } Restore::ReadActualInstalledPackages(); } @@ -1367,7 +1413,11 @@ if (RPMoption == nil) { - RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + // BNC #553400, Comment #19: Use the proposed 'Restore RPM DB' only if proposal is valid + if (haskey(proposedRPMrestoration, "proposed") && proposedRPMrestoration["proposed"]:false != nil) + RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + else + RPMoption = false; } y2warning("RPMoption: %1", RPMoption); -- 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] r60089 - in /branches/SuSE-Code-11-SP1-Branch/restore: package/yast2-restore.changes src/ui.ycp
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 11:16:17 2009 New Revision: 60089 URL: http://svn.opensuse.org/viewcvs/yast?rev=60089&view=rev Log: - Fixed restoration of unavailable packages (bnc #553400). - Fixed dialog for selecting packages to restore (bnc #553400). Modified: branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes branches/SuSE-Code-11-SP1-Branch/restore/src/ui.ycp Modified: branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/resto… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes Mon Dec 14 11:16:17 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 14 11:12:13 CET 2009 - locilka(a)suse.cz + +- Fixed restoration of unavailable packages (bnc #553400). +- Fixed dialog for selecting packages to restore (bnc #553400). + +------------------------------------------------------------------- Wed Jun 24 15:49:19 CEST 2009 - locilka(a)suse.cz - Fixed 'Archive Properties' scrolling (bnc #459657). Modified: branches/SuSE-Code-11-SP1-Branch/restore/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/resto… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/src/ui.ycp Mon Dec 14 11:16:17 2009 @@ -29,8 +29,10 @@ import "URL"; import "Popup"; +import "Report"; import "Label"; import "Package"; +import "PackageSystem"; import "Sequencer"; include "restore/helps.ycp"; @@ -1232,9 +1234,53 @@ y2milestone("install: %1", install); y2milestone("uninstall: %1", uninstall); + list <string> unavailable_packages = []; + + // Initialize the package manager (the same way it is used later) + // before checking for packages availability + PackageSystem::EnsureSourceInit(); + + // BNC #553400: Checking for all packages to install whether they are available + foreach (string one_package, install, { + // Package is not available - cannot be installed + if (Pkg::IsAvailable (one_package) != true) { + if (Popup::AnyQuestion ( + // Headline + _("Error"), + // Error message + sformat(_("Package %1 is not available on any of the subscribed repositories. +Would you like to got back and unselect the package or skip it?"), one_package), + _("Yes, Go &Back"), + _("&Skip"), + `focus_yes + )) { + y2milestone ("User has decided to go back an unselect the package (%1)", one_package); + lastret = `back; + break; + } else { + unavailable_packages = add (unavailable_packages, one_package); + y2warning ("User decided to skip missing package (%1)", one_package); + } + } + }); + + // Remove all unavailable packages from list of packages to install + foreach (string do_not_install_package, unavailable_packages, { + install = filter (string one_package, install, { + return (one_package != do_not_install_package); + }); + }); + + if (lastret == `back) + { + return `back; + } + if (size(install) > 0 || size(uninstall) > 0) { - Package::DoInstallAndRemove(install, uninstall); + if (Package::DoInstallAndRemove(install, uninstall) != true) { + Report::Error (_("Installation or removal of some packages has failed.")); + } Restore::ReadActualInstalledPackages(); } @@ -1367,7 +1413,11 @@ if (RPMoption == nil) { - RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + // BNC #553400, Comment #19: Use the proposed 'Restore RPM DB' only if proposal is valid + if (haskey(proposedRPMrestoration, "proposed") && proposedRPMrestoration["proposed"]:false != nil) + RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + else + RPMoption = false; } y2warning("RPMoption: %1", RPMoption); -- 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] r60088 - in /branches/SuSE-Code-11-Branch/restore: package/yast2-restore.changes src/ui.ycp
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 11:15:58 2009 New Revision: 60088 URL: http://svn.opensuse.org/viewcvs/yast?rev=60088&view=rev Log: - Fixed restoration of unavailable packages (bnc #553400). - Fixed dialog for selecting packages to restore (bnc #553400). Modified: branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes branches/SuSE-Code-11-Branch/restore/src/ui.ycp Modified: branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/p… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes Mon Dec 14 11:15:58 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 14 11:12:13 CET 2009 - locilka(a)suse.cz + +- Fixed restoration of unavailable packages (bnc #553400). +- Fixed dialog for selecting packages to restore (bnc #553400). + +------------------------------------------------------------------- Thu Feb 19 18:32:06 CET 2009 - locilka(a)suse.cz - A correct patch for i18n characters in summary (bnc #460674). Modified: branches/SuSE-Code-11-Branch/restore/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/s… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/src/ui.ycp (original) +++ branches/SuSE-Code-11-Branch/restore/src/ui.ycp Mon Dec 14 11:15:58 2009 @@ -29,8 +29,10 @@ import "URL"; import "Popup"; +import "Report"; import "Label"; import "Package"; +import "PackageSystem"; import "Sequencer"; include "restore/helps.ycp"; @@ -1231,9 +1233,53 @@ y2milestone("install: %1", install); y2milestone("uninstall: %1", uninstall); + list <string> unavailable_packages = []; + + // Initialize the package manager (the same way it is used later) + // before checking for packages availability + PackageSystem::EnsureSourceInit(); + + // BNC #553400: Checking for all packages to install whether they are available + foreach (string one_package, install, { + // Package is not available - cannot be installed + if (Pkg::IsAvailable (one_package) != true) { + if (Popup::AnyQuestion ( + // Headline + _("Error"), + // Error message + sformat(_("Package %1 is not available on any of the subscribed repositories. +Would you like to got back and unselect the package or skip it?"), one_package), + _("Yes, Go &Back"), + _("&Skip"), + `focus_yes + )) { + y2milestone ("User has decided to go back an unselect the package (%1)", one_package); + lastret = `back; + break; + } else { + unavailable_packages = add (unavailable_packages, one_package); + y2warning ("User decided to skip missing package (%1)", one_package); + } + } + }); + + // Remove all unavailable packages from list of packages to install + foreach (string do_not_install_package, unavailable_packages, { + install = filter (string one_package, install, { + return (one_package != do_not_install_package); + }); + }); + + if (lastret == `back) + { + return `back; + } + if (size(install) > 0 || size(uninstall) > 0) { - Package::DoInstallAndRemove(install, uninstall); + if (Package::DoInstallAndRemove(install, uninstall) != true) { + Report::Error (_("Installation or removal of some packages has failed.")); + } Restore::ReadActualInstalledPackages(); } @@ -1366,7 +1412,11 @@ if (RPMoption == nil) { - RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + // BNC #553400, Comment #19: Use the proposed 'Restore RPM DB' only if proposal is valid + if (haskey(proposedRPMrestoration, "proposed") && proposedRPMrestoration["proposed"]:false != nil) + RPMoption = (boolean) (proposedRPMrestoration["proposed"]:false); + else + RPMoption = false; } y2warning("RPMoption: %1", RPMoption); -- 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] r60087 - /trunk/storage/storage/src/testsuite/run/runtest.sh
by aschnell＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: aschnell Date: Mon Dec 14 11:02:39 2009 New Revision: 60087 URL: http://svn.opensuse.org/viewcvs/yast?rev=60087&view=rev Log: - only look at "Dump" lines Modified: trunk/storage/storage/src/testsuite/run/runtest.sh Modified: trunk/storage/storage/src/testsuite/run/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/ru… ============================================================================== --- trunk/storage/storage/src/testsuite/run/runtest.sh (original) +++ trunk/storage/storage/src/testsuite/run/runtest.sh Mon Dec 14 11:02:39 2009 @@ -77,7 +77,11 @@ rm -f "$file" } -( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" +dump_only() { + grep -E "^Dump" | sed "s/^Dump\t//" +} + +( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse | dump_only >"$2" 2>"$3" retcode="$PIPESTATUS" if [ "$retcode" -gt 0 ]; then -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0