December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60136 - /tags/branch-Code-11-SP1-2_17_6/runlevel/
by jsuchome＠svn.opensuse.org 17 Dec '09

17 Dec '09

Author: jsuchome Date: Thu Dec 17 13:21:38 2009 New Revision: 60136 URL: http://svn.opensuse.org/viewcvs/yast?rev=60136&view=rev Log: Created tag branch-Code-11-SP1-2_17_6 for runlevel Added: tags/branch-Code-11-SP1-2_17_6/runlevel/ (props changed) - copied from r60135, branches/SuSE-Code-11-SP1-Branch/runlevel/ -- 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] r60135 - in /branches/SuSE-Code-11-SP1-Branch/runlevel: VERSION package/yast2-runlevel.changes yast2-runlevel.spec.in
by jsuchome＠svn.opensuse.org 17 Dec '09

17 Dec '09

Author: jsuchome Date: Thu Dec 17 13:21:30 2009 New Revision: 60135 URL: http://svn.opensuse.org/viewcvs/yast?rev=60135&view=rev Log: - package services_proposal.ycp - 2.17.6 Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/VERSION branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes branches/SuSE-Code-11-SP1-Branch/runlevel/yast2-runlevel.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/runle… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/runlevel/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/runlevel/VERSION Thu Dec 17 13:21:30 2009 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/runle… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes Thu Dec 17 13:21:30 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 17 13:16:52 CET 2009 - jsuchome(a)suse.cz + +- package services_proposal.ycp +- 2.17.6 + +------------------------------------------------------------------- Wed Dec 9 13:40:07 CET 2009 - locilka(a)suse.cz - Added new services proposal (FATE #305583). Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/yast2-runlevel.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/runle… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/runlevel/yast2-runlevel.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/runlevel/yast2-runlevel.spec.in Thu Dec 17 13:21:30 2009 @@ -34,6 +34,7 @@ @clientdir@/runlevel_auto.ycp @clientdir@/runlevel_proposal.ycp @clientdir@/runlevel_finish.ycp +@clientdir@/services_proposal.ycp %dir @yncludedir@/runlevel @yncludedir@/runlevel/*.ycp %dir @moduledir@ -- 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] r60134 - in /branches/SuSE-Code-11-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 17 Dec '09

17 Dec '09

Author: aschnell Date: Thu Dec 17 11:46:42 2009 New Revision: 60134 URL: http://svn.opensuse.org/viewcvs/yast?rev=60134&view=rev Log: - fixed BIOS ID for MDs (bnc #565222) Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Thu Dec 17 11:46:42 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Dec 17 10:48:33 CET 2009 - aschnell(a)suse.de + +- fixed BIOS ID for MDs (bnc #565222) + +------------------------------------------------------------------- Mon Dec 14 10:19:19 CET 2009 - aschnell(a)suse.de - fixed detection of native MD RAIDs (bnc #563967) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Thu Dec 17 11:46:42 2009 @@ -3509,7 +3509,7 @@ ``{ map dtmp = Storage::GetDiskPartitionTg( dev, $[] )[0]:$[]; y2milestone( "probing dev %1 disk %2", dev, dtmp ); - if( search( dev, "/dev/dm-" )==0 ) + if( search( dev, "/dev/dm-" )==0 || search( dev, "/dev/md" )==0 ) { if( size(disk["bios_id"]:"")>0 ) bios_id_raid[dev] = disk["bios_id"]:""; @@ -3522,6 +3522,8 @@ }); tmp = filter( string dev, map disk, tmp, ``(search( dev, "/dev/dm-" )!=0)); + tmp = filter( string dev, map disk, tmp, + ``(search( dev, "/dev/md" )!=0)); if( size(rename)>0 ) { foreach( string old, string new, rename, @@ -3574,6 +3576,11 @@ y2milestone("addind bios_id %1 to %2", bios, dev); tmp[dev, "bios_id"] = bios; } + if (c["type"]:`CT_UNKNOWN == `CT_MDPART && c["device"]:"" == dm) + { + y2milestone("addind bios_id %1 to %2", bios, dev); + tmp[dev, "bios_id"] = bios; + } }); }); } -- 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> backgroud_patches_bnc550934 : BackgroundStatus - use Observable design pattern
by Ladislav Slezak 17 Dec '09

17 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit c6072e33538883c90e5284c067ddfe7195eecd33 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Dec 17 09:41:12 2009 +0100 BackgroundStatus - use Observable design pattern for reporting changes in progress --- plugins/patches/scripts/list_patches.rb | 25 ++++++++++++++++++++----- webservice/lib/background_status.rb | 21 ++++++++++----------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/plugins/patches/scripts/list_patches.rb b/plugins/patches/scripts/list_patches.rb index 25d0daf..e1d692c 100644 --- a/plugins/patches/scripts/list_patches.rb +++ b/plugins/patches/scripts/list_patches.rb @@ -4,14 +4,29 @@ # ruby-dbus is NOT thread safe and therefore patches cannot be safely read # in a separate thread, workaround is to use a separate process (this script) -bs = BackgroundStatus.new do - # print the progress in XML format - puts bs.to_xml +# this an observer class which prints changes in the progress +# in XML format on stdout +class ProgressPrinter + def initialize(prog) + # watch changes in a progress status object + prog.add_observer(self) + end - # print it immediately, flush the output buffer - $stdout.flush + # this is the callback method + def update(progress) + # print the progress in XML format + puts progress.to_xml + + # print it immediately, flush the output buffer + $stdout.flush + end end +bs = BackgroundStatus.new + +# register a progress printer for the progress object +ProgressPrinter.new(bs) + what = ARGV[0] || :available patches = Patch.do_find(what, bs) diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb index 7c666cb..12afbc6 100644 --- a/webservice/lib/background_status.rb +++ b/webservice/lib/background_status.rb @@ -2,36 +2,41 @@ class BackgroundStatus + # use Observable design pattern for reporting changes + include Observable + attr_reader :status, :progress, :subprogress - def initialize(stat = 'unknown', progress = 0, subprogress = -1, &block) + def initialize(stat = 'unknown', progress = 0, subprogress = -1) @status = stat @progress = progress @subprogress = subprogress - @callback = block_given? ? block : nil end def status=(stat) if @status != stat + changed @status = stat - trigger_callback + notify_observers self end end def progress=(p) if @progress != p + changed @progress = p - trigger_callback + notify_observers self end end # returns -1 if there is no subprogress def subprogress=(s) if @subprogress != s + changed @subprogress = s - trigger_callback + notify_observers self end end @@ -46,10 +51,4 @@ class BackgroundStatus end end - private - - def trigger_callback - @callback.try(:call) - 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> backgroud_patches_bnc550934 : use -1 instead of nil for unknown (sub)progress
by Ladislav Slezak 17 Dec '09

17 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 5ab12b89c298ef3d3d9d6fceaea6dae1c6694fdf Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Dec 17 09:40:13 2009 +0100 use -1 instead of nil for unknown (sub)progress --- plugins/patches/app/models/resolvable.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/patches/app/models/resolvable.rb b/plugins/patches/app/models/resolvable.rb index 94e6e10..dd4de07 100644 --- a/plugins/patches/app/models/resolvable.rb +++ b/plugins/patches/app/models/resolvable.rb @@ -138,9 +138,9 @@ public proxy.on_signal("ProgressChanged") do |p1, p2, p3, p4| Rails.logger.debug "PackageKit progress: ProgressChanged: #{p1}%" - bg_stat.progress = p1 - # 101% means no subprogress available - bg_stat.subprogress = p2 < 101 ? p2 : nil + # 101% means no progress/subprogress available + bg_stat.progress = p1 < 101 ? p1 : -1 + bg_stat.subprogress = p2 < 101 ? p2 : -1 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> backgroud_patches_bnc550934 : code cleanup
by Ladislav Slezak 17 Dec '09

17 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 5ffe9e7dd9d0b0998a80e3e20915d9f1896d3fd1 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Dec 17 08:51:37 2009 +0100 code cleanup --- plugins/status/lib/status.rb | 2 +- webservice/lib/background_manager.rb | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 6d94bb2..6cae118 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -155,7 +155,7 @@ class Status end def create_unique_key(start, stop, data) - 'status_' + start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s + "status_#{start}_#{stop}_#{data}" end # this is a wrapper to collect_data diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb index 2607e86..bc22281 100644 --- a/webservice/lib/background_manager.rb +++ b/webservice/lib/background_manager.rb @@ -27,20 +27,16 @@ class BackgroundManager # is the process running? def process_running?(id) - ret = false @mutex.synchronize do - ret = @running.has_key? id + @running.has_key? id end - ret end # is the process finished? def process_finished?(id) - ret = false @mutex.synchronize do - ret = @done.has_key? id + @done.has_key? id end - ret end # remove the progress status and remember the real final value @@ -54,21 +50,18 @@ class BackgroundManager # get the current progress # returns a copy, use update_progress() for updating the progress def get_progress(id) - ret = nil @mutex.synchronize do ret = @running[id] ret = ret.dup unless ret.nil? + ret end - ret end # get the final value, the value is removed from the internal structure def get_value(id) - ret = nil @mutex.synchronize do - ret = @done.delete id + @done.delete id end - ret end # update the progress -- 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> backgroud_patches_bnc550934 : BackgroundManager - fixed returning values from critical sections
by Ladislav Slezak 16 Dec '09

16 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 6af76ab2ac32ac3b56c4e68e3db1468a9679172d Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 20:09:42 2009 +0100 BackgroundManager - fixed returning values from critical sections BackgroundStatus - code clean up --- webservice/lib/background_manager.rb | 16 ++++++++++++---- webservice/lib/background_status.rb | 11 +++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb index fead92d..2607e86 100644 --- a/webservice/lib/background_manager.rb +++ b/webservice/lib/background_manager.rb @@ -27,16 +27,20 @@ class BackgroundManager # is the process running? def process_running?(id) + ret = false @mutex.synchronize do - return @running.has_key? id + ret = @running.has_key? id end + ret end # is the process finished? def process_finished?(id) + ret = false @mutex.synchronize do - return @done.has_key? id + ret = @done.has_key? id end + ret end # remove the progress status and remember the real final value @@ -50,17 +54,21 @@ class BackgroundManager # get the current progress # returns a copy, use update_progress() for updating the progress def get_progress(id) + ret = nil @mutex.synchronize do ret = @running[id] - ret.nil? ? nil : ret.dup + ret = ret.dup unless ret.nil? end + ret end # get the final value, the value is removed from the internal structure def get_value(id) + ret = nil @mutex.synchronize do - return @done.delete id + ret = @done.delete id end + ret end # update the progress diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb index 03ea420..7c666cb 100644 --- a/webservice/lib/background_status.rb +++ b/webservice/lib/background_status.rb @@ -13,9 +13,9 @@ class BackgroundStatus @callback = block_given? ? block : nil end - def status=(status) - if @status != status - @status = status + def status=(stat) + if @status != stat + @status = stat trigger_callback end end @@ -27,6 +27,7 @@ class BackgroundStatus end end + # returns -1 if there is no subprogress def subprogress=(s) if @subprogress != s @subprogress = s @@ -48,9 +49,7 @@ class BackgroundStatus private def trigger_callback - if @callback - @callback.call - end + @callback.try(:call) 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> backgroud_patches_bnc550934 : change BackgroundManager module to a singleton object
by Ladislav Slezak 16 Dec '09

16 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit a742c34ca092de714f8fc7cf503eda07b2e876a9 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 19:57:58 2009 +0100 change BackgroundManager module to a singleton object --- plugins/patches/app/models/patch.rb | 41 ++++++++++++++--------- plugins/status/lib/status.rb | 29 ++++++++++------ webservice/lib/background_manager.rb | 58 ++++++++++++++++++---------------- 3 files changed, 74 insertions(+), 54 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index bee5300..638ecc4 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -3,10 +3,19 @@ require 'resolvable' # Model for patches available via package kit class Patch < Resolvable - # extend adds the module methods as class methods - # (used instead of include because background processes - # are used in class methods here) - extend BackgroundManager + private + + # just a short cut for accessing the singleton object + def self.bm + BackgroundManager.instance + end + + # create unique id for the background manager + def self.id(what) + "patches_#{what}" + end + + public def to_xml( options = {} ) super :patch_update, options @@ -37,8 +46,6 @@ class Patch < Resolvable result = nil - process_id = what - while !subproc.eof? do begin line = subproc.readline @@ -53,7 +60,7 @@ class Patch < Resolvable elsif received.has_key? 'background_status' s = received['background_status'] - update_progress process_id do |bs| + bm.update_progress id(what) do |bs| bs.status = s['status'] bs.progress = s['progress'] bs.subprogress = s['subprogress'] @@ -84,34 +91,36 @@ class Patch < Resolvable # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) - if background && !background_enabled? + if background && !bm.background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end if background - if process_finished? what - Rails.logger.debug "Request #{what} is done" - return get_value what + proc_id = id(what) + if bm.process_finished? proc_id + Rails.logger.debug "Request #{proc_id} is done" + return bm.get_value proc_id end - running = get_progress what + running = bm.get_progress proc_id if running - Rails.logger.debug "Request #{what} is already running: #{running.inspect}" + Rails.logger.debug "Request #{proc_id} is already running: #{running.inspect}" return [running] end - add_process what + + bm.add_process proc_id Rails.logger.info "Starting background thread for reading patches..." # run the patch query in a separate thread Thread.new do res = subprocess_find what Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" - finish_process(what, res) + bm.finish_process(proc_id, res) end - return [ get_progress(what) ] + return [ bm.get_progress(proc_id) ] else return do_find(what) end diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index cad3412..6d94bb2 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -10,7 +10,14 @@ class Status :metrics, :limits - include BackgroundManager + private + + # just a short cut for accessing the singleton object + def bm + BackgroundManager.instance + end + + public def to_xml(options = {}) if @data.class == Hash && @data.size == 1 && @data[:progress].class == BackgroundStatus @@ -148,14 +155,14 @@ class Status end def create_unique_key(start, stop, data) - start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s + 'status_' + start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s end # this is a wrapper to collect_data def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}, background = false) # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) - if background && !background_enabled? + if background && !bm.background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end @@ -163,32 +170,32 @@ class Status if background key = create_unique_key(start, stop, data) - if process_finished? key + if bm.process_finished? key Rails.logger.debug "Request #{key} is done" - @data = get_value key + @data = bm.get_value key @data.delete :progress return @data end - running = get_progress key + running = bm.get_progress key if running Rails.logger.debug "Request #{key} is already running: #{running.inspect}" @data = {:progress => running} return @data end - add_process(key) + bm.add_process(key) # read the status in a separate thread Thread.new do Rails.logger.info '*** Background thread for reading status started...' res = collect_status_data(start, stop, data, true) - finish_process(key, res) + bm.finish_process(key, res) Rails.logger.info '*** Finishing background status thread' end # return current progress - @data = {:progress => get_progress(key)} + @data = {:progress => bm.get_progress(key)} return @data else collect_status_data(start, stop, data) @@ -209,7 +216,7 @@ class Status metrics.each_pair do |m, n| if progress - update_progress key do |stat| + bm.update_progress key do |stat| stat.status = m.to_s stat.progress = 100 * current_step / total_steps Rails.logger.debug "*** Reading status: #{stat.status}: #{stat.progress}%" @@ -228,7 +235,7 @@ class Status total_steps = data.size if progress data.each do |d| if progress - update_progress key do |stat| + bm.update_progress key do |stat| stat.status = d.to_s stat.progress = 100 * current_step / total_steps Rails.logger.debug "*** Reading status: #{stat.status}: #{stat.progress}%" diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb index 722d078..fead92d 100644 --- a/webservice/lib/background_manager.rb +++ b/webservice/lib/background_manager.rb @@ -1,68 +1,72 @@ -# this is a helper module for managing background processes with progress +# this is a singleton class for managing background processes with progress # for long running tasks -module BackgroundManager - # class variables - they keep the information between requests - # DO NOT USE THEM DIRECTLY, USE THE THREAD SAFE METHODS BELOW! - # - # currently running requests in background (current states) - @@running = Hash.new - # finished requests (actual results) - @@done = Hash.new - # a mutex which guards access to the shared class variables above - @@mutex = Mutex.new +class BackgroundManager + + include Singleton + + # instance variables - they keep the information between requests + + def initialize + # currently running requests in background (current states) + @running = Hash.new + # finished requests (actual results) + @done = Hash.new + # a mutex which guards access to the shared class variables above + @mutex = Mutex.new + end # define a new background process # id is unique ID def add_process(id) - @@mutex.synchronize do - @@running[id] = BackgroundStatus.new unless @@running.has_key?(id) + @mutex.synchronize do + @running[id] = BackgroundStatus.new unless @running.has_key?(id) end end # is the process running? def process_running?(id) - @@mutex.synchronize do - return @@running.has_key? id + @mutex.synchronize do + return @running.has_key? id end end # is the process finished? def process_finished?(id) - @@mutex.synchronize do - return @@done.has_key? id + @mutex.synchronize do + return @done.has_key? id end end # remove the progress status and remember the real final value def finish_process(id, value) - @@mutex.synchronize do - @@running.delete(id) - @@done[id] = value + @mutex.synchronize do + @running.delete(id) + @done[id] = value end end # get the current progress # returns a copy, use update_progress() for updating the progress def get_progress(id) - @@mutex.synchronize do - ret = @@running[id] + @mutex.synchronize do + ret = @running[id] ret.nil? ? nil : ret.dup end end # get the final value, the value is removed from the internal structure def get_value(id) - @@mutex.synchronize do - return @@done.delete id + @mutex.synchronize do + return @done.delete id end end # update the progress def update_progress(id, &block) - @@mutex.synchronize do - bs = @@running[id] + @mutex.synchronize do + bs = @running[id] yield bs if bs && block_given? end @@ -71,7 +75,7 @@ module BackgroundManager # is background processing possible? # if cache_classes is disabled it is not possible # because all classes are reloaded between requests - # and the static attributes keeping the progress are lost + # and the attributes keeping the progress are lost def background_enabled? return Rails.configuration.cache_classes 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> backgroud_patches_bnc550934 : pass also the requested patch ID to the subscript
by Ladislav Slezak 16 Dec '09

16 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 1f11d6a11f283b7ee266f36bfaf42b2948b689ec Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 18:56:58 2009 +0100 pass also the requested patch ID to the subscript --- plugins/patches/app/models/patch.rb | 15 +++++++++------ plugins/patches/scripts/list_patches.rb | 4 +++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index a3608c6..bee5300 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -32,12 +32,13 @@ class Patch < Resolvable end def self.subprocess_find(what) - # open subprocess - subproc = IO.popen(subprocess_command) + subproc = IO.popen(subprocess_command what) result = nil + process_id = what + while !subproc.eof? do begin line = subproc.readline @@ -52,7 +53,7 @@ class Patch < Resolvable elsif received.has_key? 'background_status' s = received['background_status'] - update_progress what do |bs| + update_progress process_id do |bs| bs.status = s['status'] bs.progress = s['progress'] bs.subprogress = s['subprogress'] @@ -155,8 +156,10 @@ class Patch < Resolvable script end - def self.subprocess_command - 'cd ' + RAILS_ROOT + ' && ' + File.join(RAILS_ROOT, 'script/runner') + ' -e ' + - (ENV["RAILS_ENV"] || 'development') + ' ' + subprocess_script + def self.subprocess_command(what) + raise "Invalid parameter" if what.to_s.include?("'") or what.to_s.include?('\\') + ret = "cd #{RAILS_ROOT} && #{File.join(RAILS_ROOT, 'script/runner')} -e #{ENV['RAILS_ENV'] || 'development'} #{subprocess_script}" + ret += " #{what}" if what != :available + ret end end diff --git a/plugins/patches/scripts/list_patches.rb b/plugins/patches/scripts/list_patches.rb index 06c0c74..25d0daf 100644 --- a/plugins/patches/scripts/list_patches.rb +++ b/plugins/patches/scripts/list_patches.rb @@ -12,6 +12,8 @@ bs = BackgroundStatus.new do $stdout.flush end -patches = Patch.do_find(:all, bs) +what = ARGV[0] || :available + +patches = Patch.do_find(what, bs) puts patches.to_xml(:root => "patches", :dasherize => false).gsub!("\n", '') -- 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] r60133 - in /trunk/autoinstallation: package/autoyast2.changes src/include/autopart.ycp
by aschnell＠svn.opensuse.org 16 Dec '09

16 Dec '09

Author: aschnell Date: Wed Dec 16 18:46:51 2009 New Revision: 60133 URL: http://svn.opensuse.org/viewcvs/yast?rev=60133&view=rev Log: - adapted encryption password setting to new yast2-storage Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/autopart.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Dec 16 18:46:51 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 16 18:44:20 CET 2009 - aschnell(a)suse.de + +- adapted encryption password setting to new yast2-storage + +------------------------------------------------------------------- Wed Nov 25 15:55:10 CET 2009 - ug(a)suse.de - mountby was not cloned correctly (bnc#557759) Modified: trunk/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/aut… ============================================================================== --- trunk/autoinstallation/src/include/autopart.ycp (original) +++ trunk/autoinstallation/src/include/autopart.ycp Wed Dec 16 18:46:51 2009 @@ -461,7 +461,7 @@ { //p["loop_fs"] = solution["partitions",pindex,"crypt_fs"]:false; p["enc_type"] = solution["partitions",pindex,"enc_type"]:`twofish; - Storage::UpdateClassified( p["device"]:"", + Storage::SetCryptPwd( p["device"]:"", solution["partitions",pindex,"crypt_key"]:"" ); //p["crypt"] = solution["partitions",pindex,"crypt"]:"twofish256"; } @@ -582,7 +582,7 @@ { //part["loop_fs"] = solution["partitions",pindex,"crypt_fs"]:false; part["enc_type"] = solution["partitions",pindex,"enc_type"]:`twofish; - Storage::UpdateClassified( part["device"]:"", + Storage::SetCryptPwd( part["device"]:"", solution["partitions",pindex,"crypt_key"]:"" ); //part["crypt"] = solution["partitions",pindex,"crypt"]:"twofish256"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0