Author: mzugec Date: Tue Jul 14 13:29:44 2009 New Revision: 58036 URL: http://svn.opensuse.org/viewcvs/yast?rev=58036&view=rev Log: correctly write supporturl (bnc#520169) Modified: branches/SuSE-Code-11-Branch/installation/VERSION branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-Branch/installation/src/clients/save_config_finish.ycp Modified: branches/SuSE-Code-11-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/VERSION?rev=58036&r1=58035&r2=58036&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/installation/VERSION Tue Jul 14 13:29:44 2009 @@ -1 +1 @@ -2.17.54 +2.17.55 Modified: branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes?rev=58036&r1=58035&r2=58036&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes Tue Jul 14 13:29:44 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 8 16:04:00 CEST 2009 - mzugec@suse.de + +- correctly write supporturl (bnc#520169) +- 2.17.55 + +------------------------------------------------------------------- Mon Mar 9 19:59:12 CET 2009 - locilka@suse.cz - Adjusting second stage of update steps to be enabled even if AC Modified: branches/SuSE-Code-11-Branch/installation/src/clients/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/src/clients/save_config_finish.ycp?rev=58036&r1=58035&r2=58036&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/installation/src/clients/save_config_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/installation/src/clients/save_config_finish.ycp Tue Jul 14 13:29:44 2009 @@ -145,12 +145,14 @@ string url = (string)SCR::Read(.etc.install_inf.supporturl); y2milestone("URL value from /etc/install.inf : %1", url); if( url!=nil && size(url)>0){ - string config_path=sformat("%1%2", String::Quote(Installation::destdir), "/etc/supportconfig.conf"); + string config_path= "/etc/supportconfig.conf"; //sformat("%1%2", String::Quote(Installation::destdir), "/etc/supportconfig.conf"); y2milestone("URL from install.inf readed, test if %1 exists", config_path); if (FileUtils::Exists(config_path)){ - y2milestone("Insert value into supportconfig.conf: %1", - SCR::Execute(.target.bash_output, sformat("echo 'VAR_OPTION_UPLOAD_TARGET=%1'>> %2", url, config_path))); - } + y2milestone("Insert value into supportconfig.conf: %1", url); + SCR::Execute(.target.bash_output,sformat("sed -i '/VAR_OPTION_UPLOAD_TARGET=.*/d;/^$/d' %1", config_path)); + SCR::Execute(.target.bash_output, sformat("echo \"VAR_OPTION_UPLOAD_TARGET='%1'\">> %2", url, config_path)); +// SCR::Write(.target.string, config_path, sformat("VAR_OPTION_UPLOAD_TARGET=%1", url)); + } else y2error("filename %1 was not found", config_path); } } else y2warning("/etc/install.inf not found"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org