December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60115 - /tags/stable-2_19_0/ncurses/
by kmachalkova＠svn.opensuse.org 15 Dec '09

15 Dec '09

Author: kmachalkova Date: Tue Dec 15 20:47:08 2009 New Revision: 60115 URL: http://svn.opensuse.org/viewcvs/yast?rev=60115&view=rev Log: Created tag stable-2_19_0 for ncurses Added: tags/stable-2_19_0/ncurses/ - copied from r60114, trunk/ncurses/ -- 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] r60114 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes src/NCstring.cc
by kmachalkova＠svn.opensuse.org 15 Dec '09

15 Dec '09

Author: kmachalkova Date: Tue Dec 15 20:46:59 2009 New Revision: 60114 URL: http://svn.opensuse.org/viewcvs/yast?rev=60114&view=rev Log: this && that => this & that Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCstring.cc Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=60114&r1=601… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue Dec 15 20:46:59 2009 @@ -1 +1 @@ -2.18.10 +2.19.0 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue Dec 15 20:46:59 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 15 20:06:59 CET 2009 - kmachalkova(a)suse.cz + +- Allow escaping '&' characters in string with hotkey support - + convert 'foo&&bar' to 'foo&bar' (bnc#559226) +-V 2.19.0 + +------------------------------------------------------------------- Thu May 28 11:28:12 CEST 2009 - gs(a)suse.de - NCTable/NCTablePad: only sort in reverse order if Ctrl 'o' Modified: trunk/ncurses/src/NCstring.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCstring.cc?rev=6011… ============================================================================== --- trunk/ncurses/src/NCstring.cc (original) +++ trunk/ncurses/src/NCstring.cc Tue Dec 15 20:46:59 2009 @@ -318,22 +318,44 @@ { hotp = wstring::npos; - // strip hotkey from wstr - wstring::size_type tpos = wstr.find_first_of( L'&' ); - - if ( tpos != wstring::npos && tpos != wstr.size() - 1 ) + const wchar_t shortcutMarker = L'&'; + // strip hotkey from wstr and convert &&s + wstring::size_type tpos = 0; + wstring::size_type pos = tpos; + + // borrowed from libyui (libyui inserts "&"s if none is there, + // but fortunately it keeps "&&" in place) + while ( ( pos = wstr.find( shortcutMarker, pos ) ) != wstring::npos ) { - size_t realpos = 0, t; - - for ( t = 0; t < tpos; t++ ) - realpos += wcwidth( wstr[t] ); - - wstr.erase( tpos, 1 ); - - hotk = wstr[tpos]; - - hotp = realpos; + if ( pos+1 < wstr.length() ) + { + // regular hotkey ( "&P" ) + if ( wstr[ pos+1 ] != shortcutMarker ) + tpos = pos; + // escape marker ("&&" ) + else + wstr.erase(pos,1); // make it only one & + + pos += 1; // and search for more + } + else + { + // A pathological case: The string ends with '& '. + // This is invalid anyway, but prevent endless loop even in this case. + pos = string::npos; + } } + + size_t realpos = 0, t; + + for ( t = 0; t < tpos; t++ ) + realpos += wcwidth( wstr[t] ); + + wstr.erase( tpos, 1 ); + + hotk = wstr[tpos]; + + hotp = realpos; } -- 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 : patches and status - moved the shared background code
by Ladislav Slezak 15 Dec '09

15 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit fe2894a7088810c100f1eac4a071a6911e8193ba Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Dec 15 20:13:59 2009 +0100 patches and status - moved the shared background code to BackgroundManager module (for thread safe acess and better readability) --- plugins/patches/app/models/patch.rb | 53 +++++++++------------- plugins/status/lib/status.rb | 78 ++++++++++++++------------------ webservice/lib/background_manager.rb | 80 ++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 76 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index dd861de..a3608c6 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -3,14 +3,10 @@ require 'resolvable' # Model for patches available via package kit class Patch < Resolvable - # class variables - they keep the information between requests - # - # currently running patch 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 + # extend adds the module methods as class methods + # (used instead of include because background processes + # are used in class methods here) + extend BackgroundManager def to_xml( options = {} ) super :patch_update, options @@ -35,7 +31,7 @@ class Patch < Resolvable return patch_updates end - def self.subprocess_find(what, bs) + def self.subprocess_find(what) # open subprocess subproc = IO.popen(subprocess_command) @@ -55,7 +51,8 @@ class Patch < Resolvable result = received['patches'] elsif received.has_key? 'background_status' s = received['background_status'] - @@mutex.synchronize do + + update_progress what do |bs| bs.status = s['status'] bs.progress = s['progress'] bs.subprogress = s['subprogress'] @@ -86,42 +83,34 @@ class Patch < Resolvable # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) - if background && !Rails.configuration.cache_classes + if background && !background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end if background - # background status - bs = nil - @@mutex.synchronize do - if @@done.has_key?(what) - Rails.logger.debug "Request #{what} is done" - return @@done.delete(what) - end - - running = @@running[what] - if running - Rails.logger.debug "Request #{what} is already running: #{running.inspect}" - return [running] - end + if process_finished? what + Rails.logger.debug "Request #{what} is done" + return get_value what + end - bs = BackgroundStatus.new - @@running[what] = bs + running = get_progress what + if running + Rails.logger.debug "Request #{what} is already running: #{running.inspect}" + return [running] end + add_process what + Rails.logger.info "Starting background thread for reading patches..." # run the patch query in a separate thread Thread.new do - res = subprocess_find(what, bs) + res = subprocess_find what Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" - @@mutex.synchronize do - @@running.delete(what) - @@done[what] = res - end + finish_process(what, res) end - return [bs] + return [ get_progress(what) ] else return do_find(what) end diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 1bcdabe..cad3412 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -10,12 +10,7 @@ class Status :metrics, :limits - # currently running status 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 + include BackgroundManager def to_xml(options = {}) if @data.class == Hash && @data.size == 1 && @data[:progress].class == BackgroundStatus @@ -152,51 +147,48 @@ class Status def draw_graph(heigth=nil, width=nil) end + def create_unique_key(start, stop, data) + 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 && !Rails.configuration.cache_classes + if background && !background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end if background - # background status - bs = nil - key = start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s - @@mutex.synchronize do - if @@done.has_key?(key) - Rails.logger.debug "Request #{key} is done" - @data = @@done.delete key - @data.delete :progress - return @data - end + key = create_unique_key(start, stop, data) - running = @@running[key] - if running - Rails.logger.debug "Request #{key} is already running: #{running.inspect}" - @data = {:progress => running} - return @data - end + if process_finished? key + Rails.logger.debug "Request #{key} is done" + @data = get_value key + @data.delete :progress + return @data + end - bs = BackgroundStatus.new - @@running[key] = bs + running = get_progress key + if running + Rails.logger.debug "Request #{key} is already running: #{running.inspect}" + @data = {:progress => running} + return @data end + + 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, bs) - @@mutex.synchronize do - @@running.delete(key) - @@done[key] = res - end + res = collect_status_data(start, stop, data, true) + finish_process(key, res) Rails.logger.info '*** Finishing background status thread' end # return current progress - @data = {:progress => bs} + @data = {:progress => get_progress(key)} return @data else collect_status_data(start, stop, data) @@ -204,8 +196,8 @@ class Status end # creates several metrics for a defined period - def collect_status_data(start=nil, stop=nil, data = %w{cpu memory disk}, progress=nil) - + def collect_status_data(start=nil, stop=nil, data = %w{cpu memory disk}, progress=false) + key = create_unique_key(start, stop, data) if progress metrics = available_metrics #puts metrics.inspect result = Hash.new @@ -213,16 +205,14 @@ class Status current_step = 0 if progress case data when nil, "all", "All" # all metrics - if progress - total_steps = metrics.size - end + total_steps = metrics.size if progress metrics.each_pair do |m, n| if progress - @@mutex.synchronize do - progress.status = m.to_s - progress.progress = 100 * current_step / total_steps - Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + 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}%" end end @@ -238,10 +228,10 @@ class Status total_steps = data.size if progress data.each do |d| if progress - @@mutex.synchronize do - progress.status = d.to_s - progress.progress = 100 * current_step / total_steps - Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + 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}%" end end diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb new file mode 100644 index 0000000..722d078 --- /dev/null +++ b/webservice/lib/background_manager.rb @@ -0,0 +1,80 @@ + +# this is a helper module 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 + + # 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) + end + end + + # is the process running? + def process_running?(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 + 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 + 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] + 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 + end + end + + # update the progress + def update_progress(id, &block) + @@mutex.synchronize do + bs = @@running[id] + + yield bs if bs && block_given? + end + end + + # 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 + def background_enabled? + return Rails.configuration.cache_classes + 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] r60113 - /tags/branch-Code-11-SP1-2_17_26/ldap-server/
by rhafer＠svn.opensuse.org 15 Dec '09

15 Dec '09

Author: rhafer Date: Tue Dec 15 17:45:09 2009 New Revision: 60113 URL: http://svn.opensuse.org/viewcvs/yast?rev=60113&view=rev Log: Created tag branch-Code-11-SP1-2_17_26 for ldap-server Added: tags/branch-Code-11-SP1-2_17_26/ldap-server/ (props changed) - copied from r60112, branches/SuSE-Code-11-SP1-Branch/ldap-server/ -- 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] r60112 - /tags/branch-Code-11-SP1-2_17_26/
by rhafer＠svn.opensuse.org 15 Dec '09

15 Dec '09

Author: rhafer Date: Tue Dec 15 17:45:03 2009 New Revision: 60112 URL: http://svn.opensuse.org/viewcvs/yast?rev=60112&view=rev Log: Created tag branch-Code-11-SP1-2_17_26 Added: tags/branch-Code-11-SP1-2_17_26/ -- 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 : background_status.rb has been moved to the base package
by Ladislav Slezak 15 Dec '09

15 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 612bb676d78f3f8e3d7c5f71b6b01a18949f3a12 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Dec 15 15:19:27 2009 +0100 background_status.rb has been moved to the base package so it can be used in other plugins (the status plugin currently) --- plugins/patches/app/models/background_status.rb | 56 ----------------------- webservice/lib/background_status.rb | 56 +++++++++++++++++++++++ 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/plugins/patches/app/models/background_status.rb b/plugins/patches/app/models/background_status.rb deleted file mode 100644 index b7f7127..0000000 --- a/plugins/patches/app/models/background_status.rb +++ /dev/null @@ -1,56 +0,0 @@ -# This class collects progress data of a background process - -class BackgroundStatus - - attr_reader :status, - :progress, - :subprogress - - def initialize(stat = 'unknown', progress = 0, subprogress = nil, &block) - @status = stat - @progress = progress - @subprogress = subprogress - @callback = block_given? ? block : nil - end - - def status=(status) - if @status != status - @status = status - trigger_callback - end - end - - def progress=(p) - if @progress != p - @progress = p - trigger_callback - end - end - - def subprogress=(s) - if @subprogress != s - @subprogress = s - trigger_callback - end - end - - def to_xml(options = {}) - xml = options[:builder] ||= Builder::XmlMarkup.new(options) - xml.instruct! unless options[:skip_instruct] - - xml.tag! :background_status do - xml.tag!(:status, @status) - xml.tag!(:progress, @progress.to_i, {:type => "integer"} ) - xml.tag!(:subprogress, @subprogress.to_i, {:type => "integer"}) - end - end - - private - - def trigger_callback - if @callback - @callback.call - end - end - -end diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb new file mode 100644 index 0000000..b7f7127 --- /dev/null +++ b/webservice/lib/background_status.rb @@ -0,0 +1,56 @@ +# This class collects progress data of a background process + +class BackgroundStatus + + attr_reader :status, + :progress, + :subprogress + + def initialize(stat = 'unknown', progress = 0, subprogress = nil, &block) + @status = stat + @progress = progress + @subprogress = subprogress + @callback = block_given? ? block : nil + end + + def status=(status) + if @status != status + @status = status + trigger_callback + end + end + + def progress=(p) + if @progress != p + @progress = p + trigger_callback + end + end + + def subprogress=(s) + if @subprogress != s + @subprogress = s + trigger_callback + end + end + + def to_xml(options = {}) + xml = options[:builder] ||= Builder::XmlMarkup.new(options) + xml.instruct! unless options[:skip_instruct] + + xml.tag! :background_status do + xml.tag!(:status, @status) + xml.tag!(:progress, @progress.to_i, {:type => "integer"} ) + xml.tag!(:subprogress, @subprogress.to_i, {:type => "integer"}) + end + end + + private + + def trigger_callback + if @callback + @callback.call + 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] <web-client> master : logs after merged branch
by Stefan Schubert 15 Dec '09

15 Dec '09

ref: refs/heads/master commit 740d2b50cf1bf0873ecdd7fc9b8a67606e29e4e0 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Dec 15 14:59:35 2009 +0100 logs after merged branch --- webclient/package/yast2-webclient.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index c639c20..0b5a172 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 15 14:58:48 CET 2009 - schubi(a)suse.de + +- cleanup Rakefiles in order to not hijack root rakefile +- Inconsisten Save/Cancel Buttons in edit status limits (bnc#551849) + +------------------------------------------------------------------- Fri Dec 4 14:25:13 CET 2009 - mvidner(a)suse.cz - Require fixes in other packages so that rclighttpd does not kill -- 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 : logs after merged branch
by Stefan Schubert 15 Dec '09

15 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 740d2b50cf1bf0873ecdd7fc9b8a67606e29e4e0 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Dec 15 14:59:35 2009 +0100 logs after merged branch --- webclient/package/yast2-webclient.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index c639c20..0b5a172 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 15 14:58:48 CET 2009 - schubi(a)suse.de + +- cleanup Rakefiles in order to not hijack root rakefile +- Inconsisten Save/Cancel Buttons in edit status limits (bnc#551849) + +------------------------------------------------------------------- Fri Dec 4 14:25:13 CET 2009 - mvidner(a)suse.cz - Require fixes in other packages so that rclighttpd does not kill -- 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 : update spec file after merging branches
by Stefan Schubert 15 Dec '09

15 Dec '09

ref: refs/heads/master commit 0aefaf4f696e2200be2a720c6b37fd9c10a8ae87 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Dec 15 14:29:18 2009 +0100 update spec file after merging branches --- webservice/package/yast2-webservice.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/webservice/package/yast2-webservice.changes b/webservice/package/yast2-webservice.changes index 3343b79..4a7c609 100644 --- a/webservice/package/yast2-webservice.changes +++ b/webservice/package/yast2-webservice.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 15 14:28:16 CET 2009 - schubi(a)suse.de + +- unify checking permissions (bnc#555208) +- nicer date/time format in control center (bnc#558360) + +------------------------------------------------------------------- Fri Dec 4 14:28:39 CET 2009 - mvidner(a)suse.cz - Require fixes in other packages so that rclighttpd does not kill -- 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] r60111 - /trunk/autoinstallation/src/include/io.ycp
by ug＠svn.opensuse.org 15 Dec '09

15 Dec '09

Author: ug Date: Tue Dec 15 12:02:03 2009 New Revision: 60111 URL: http://svn.opensuse.org/viewcvs/yast?rev=60111&view=rev Log: just indentation Modified: trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Tue Dec 15 12:02:03 2009 @@ -14,7 +14,7 @@ import "HTTP"; import "StorageDevices"; import "TFTP"; - import "AutoinstConfig"; + import "AutoinstConfig"; string GET_error = ""; @@ -24,10 +24,10 @@ * @return string basename */ define string basename (string filePath) - ``{ - list pathComponents = splitstring(filePath, "/"); - string ret = pathComponents[size(pathComponents) -1 ]: ""; - return ( ret ); + ``{ + list pathComponents = splitstring(filePath, "/"); + string ret = pathComponents[size(pathComponents) -1 ]: ""; + return ( ret ); } @@ -37,11 +37,11 @@ * @return string dirname */ define string dirname (string filePath) - ``{ - list pathComponents = splitstring(filePath, "/"); - string last = pathComponents[size(pathComponents) -1]:""; - string ret = substring(filePath, 0 , size(filePath) - size(last)); - return (ret); + ``{ + list pathComponents = splitstring(filePath, "/"); + string last = pathComponents[size(pathComponents) -1]:""; + string ret = substring(filePath, 0 , size(filePath) - size(last)); + return (ret); } @@ -50,82 +50,82 @@ * @return boolean true on success */ define boolean Get(string Scheme, - string Host, - string Path, - string Localfile) - ``{ + string Host, + string Path, + string Localfile) + ``{ GET_error = ""; - boolean ok = false; - map res = $[]; - map toks = AutoinstConfig::urltok; - toks["scheme"] = Scheme; - toks["host"] = Host; + boolean ok = false; + map res = $[]; + map toks = AutoinstConfig::urltok; + toks["scheme"] = Scheme; + toks["host"] = Host; if (regexpsub(Path, "(.*)//(.*)", "\\1\/\\2")!= nil) { Path = regexpsub(Path, "(.*)//(.*)", "\\1\/\\2"); } - toks["path"] = Path; + toks["path"] = Path; string full_url = URL::Build(toks); string tmp_dir = (string)WFM::Read(.local.tmpdir, []); string mount_point = tmp_dir + "/tmp_mount"; WFM::Execute(.local.mkdir, mount_point ); - if ( Scheme == "http" || Scheme == "https" ) - { + if ( Scheme == "http" || Scheme == "https" ) + { HTTP::easySSL( true ); - res = HTTP::Get(full_url, Localfile); - if (res["code"]:0 == 200) - { + res = HTTP::Get(full_url, Localfile); + if (res["code"]:0 == 200) + { GET_error = ""; - return (true); - } - else - { - y2error("Can't find URL: %1", full_url); + return (true); + } + else + { + y2error("Can't find URL: %1", full_url); // autoyast tried to read a file but had no success. GET_error = sformat(_("Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."),full_url,res["code"]:0); - return (false); - } - } - if ( Scheme == "ftp" ) - { - res = FTP::Get(full_url, Localfile); - if ( ( res["code"]:-1 >= 200 && res["code"]:-1 < 300 ) && SCR::Read(.target.size, Localfile) > 0 ) - { + return (false); + } + } + if ( Scheme == "ftp" ) + { + res = FTP::Get(full_url, Localfile); + if ( ( res["code"]:-1 >= 200 && res["code"]:-1 < 300 ) && SCR::Read(.target.size, Localfile) > 0 ) + { GET_error = ""; - return (true); - } - else - { - y2error("Can't find URL: %1", full_url); + return (true); + } + else + { + y2error("Can't find URL: %1", full_url); // autoyast tried to read a file but had no success. GET_error = sformat(_("Cannot find URL '%1' via protocol FTP. Server returned code %2."),full_url,res["code"]:0); - return (false); - } - } - else if (Scheme == "file") - { - string file = sformat("%1/%2", Installation::sourcedir, Path); // FIXME: I have doubts this will ever work. Too early. - if (SCR::Read(.target.size, file) > 0 ) - { - string cpcmd = sformat("cp %1 %2", file, Localfile); - y2milestone("Copy profile: %1", cpcmd); - SCR::Execute(.target.bash, cpcmd); - } - else - { + return (false); + } + } + else if (Scheme == "file") + { + string file = sformat("%1/%2", Installation::sourcedir, Path); // FIXME: I have doubts this will ever work. Too early. + if (SCR::Read(.target.size, file) > 0 ) + { + string cpcmd = sformat("cp %1 %2", file, Localfile); + y2milestone("Copy profile: %1", cpcmd); + SCR::Execute(.target.bash, cpcmd); + } + else + { GET_error = GET_error + sformat(_("Reading file on %1/%2 failed.\n"), Installation::sourcedir, Path); - string cpcmd = sformat("cp %1 %2", Path , Localfile); - y2milestone("Copy profile: %1", cpcmd); - SCR::Execute(.target.bash, cpcmd); - } + string cpcmd = sformat("cp %1 %2", Path , Localfile); + y2milestone("Copy profile: %1", cpcmd); + SCR::Execute(.target.bash, cpcmd); + } - if (SCR::Read(.target.size, Localfile) > 0 ) - { + if (SCR::Read(.target.size, Localfile) > 0 ) + { GET_error = ""; ok = true; - } else { + } else { GET_error = GET_error + sformat(_("Reading file on %1 failed.\n"), Path); y2milestone("Trying to find file on installation media: %1", Installation::boot ()); if (Installation::boot () == "cd") { @@ -169,92 +169,92 @@ // autoyast tried to read a file but had no success. GET_error = GET_error + sformat(_("Reading a file on CD failed. Path: %1/%2."),mount_point,Path); ok = false; - } - } - else if (Scheme == "nfs") // NFS - { - if (Installation::boot () != "nfs") - { - y2milestone("Starting portmap: %1", SCR::Execute (.target.bash, "/sbin/portmap") ); - } + } + } + else if (Scheme == "nfs") // NFS + { + if (Installation::boot () != "nfs") + { + y2milestone("Starting portmap: %1", SCR::Execute (.target.bash, "/sbin/portmap") ); + } - if( !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o nolock" ) && + if( !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o nolock" ) && !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-t nfs4" ) ) - { - y2warning("Mount failed"); + { + y2warning("Mount failed"); // autoyast tried to mount a NFS directory which failed GET_error = sformat(_("Mounting %1 failed."), Host + ":" + dirname(Path) ); - return (false); - } + return (false); + } string copyCmd = "/bin/cp " + mount_point + "/" + basename(Path) + " " + Localfile; y2milestone("Copy Command: %1", copyCmd); - if (WFM::Execute (.local.bash, copyCmd ) == 0) - { + if (WFM::Execute (.local.bash, copyCmd ) == 0) + { GET_error = ""; - ok = true; - } - else - { + ok = true; + } + else + { // autoyast tried to copy a file via NFS which failed GET_error = sformat(_("Remote file %1 cannot be retrieved"), mount_point + "/"+ basename(Path) ); - y2error("remote file %1 can't be retrieved", mount_point + "/" + y2error("remote file %1 can't be retrieved", mount_point + "/" + basename(Path)); - } + } - WFM::Execute(.local.umount, mount_point); + WFM::Execute(.local.umount, mount_point); - } - else if (Scheme == "cifs") // CIFS - { - if (!(boolean)SCR::Execute(.target.mount, + } + else if (Scheme == "cifs") // CIFS + { + if (!(boolean)SCR::Execute(.target.mount, [ "//" + Host + dirname(Path), mount_point ], "-t cifs -o guest,ro" )) - { - y2warning("Mount failed"); + { + y2warning("Mount failed"); // autoyast tried to mount a NFS directory which failed GET_error = sformat(_("Mounting %1 failed."), "//" + Host + dirname(Path) ); - return (false); - } + return (false); + } string copyCmd = "/bin/cp " + mount_point + "/" + basename(Path) + " " + Localfile; y2milestone("Copy Command: %1", copyCmd); - if (WFM::Execute (.local.bash, copyCmd ) == 0) - { + if (WFM::Execute (.local.bash, copyCmd ) == 0) + { GET_error = ""; - ok = true; - } - else - { + ok = true; + } + else + { // autoyast tried to copy a file via NFS which failed GET_error = sformat(_("Remote file %1 cannot be retrieved"), mount_point + "/"+ basename(Path) ); - y2error("remote file %1 can't be retrieved", mount_point + "/" + y2error("remote file %1 can't be retrieved", mount_point + "/" + basename(Path)); - } + } + + WFM::Execute(.local.umount, mount_point); - WFM::Execute(.local.umount, mount_point); + } + else if (Scheme == "floppy" || Scheme == "usb") + { + if (StorageDevices::FloppyReady() && Scheme == "floppy") + { + WFM::Execute(.local.mount, [StorageDevices::FloppyDevice(), mount_point]); - } - else if (Scheme == "floppy" || Scheme == "usb") - { - if (StorageDevices::FloppyReady() && Scheme == "floppy") - { - WFM::Execute(.local.mount, [StorageDevices::FloppyDevice(), mount_point]); - - if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0) - { - y2error("file %1 can't be retrieved", mount_point + "/" + Path ); - } - else - { + if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0) + { + y2error("file %1 can't be retrieved", mount_point + "/" + Path ); + } + else + { GET_error = ""; - ok = true; - } - SCR::Execute(.target.umount, mount_point); - } else { + ok = true; + } + SCR::Execute(.target.umount, mount_point); + } else { y2milestone("looking for %1 on USB", Path); list<map> probe = (list<map>)SCR::Read(.probe.usb); foreach( map d, probe, ``{ @@ -286,11 +286,11 @@ break; }); } - } - else if (Scheme == "device") // Device - { - if ( Path != "") - { + } + else if (Scheme == "device") // Device + { + if ( Path != "") + { list<string> deviceList = []; if( Host == "" ) { list<map> disks = (list<map>)SCR::Read(.probe.disk); @@ -361,28 +361,28 @@ break; }); } - } - else if (Scheme == "tftp") // Device - { - if (TFTP::Get( Host, Path, Localfile )) - { + } + else if (Scheme == "tftp") // Device + { + if (TFTP::Get( Host, Path, Localfile )) + { GET_error = ""; - ok = true; - } - else - { + ok = true; + } + else + { GET_error = sformat(_("Cannot find URL '%1' via protocol TFTP."),Host+":"+Path); - y2error("file %1 can't be found", Path ); - } - } - else - { + y2error("file %1 can't be found", Path ); + } + } + else + { // the user wanted autoyast to fetch it's profile via an unknown protocol GET_error = sformat(_("Unknown protocol %1."),Scheme); - y2error("Protocol not supported"); - ok = false; - } - return ( ok ); + y2error("Protocol not supported"); + ok = false; + } + return ( ok ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0