Author: locilka Date: Wed Feb 6 13:24:02 2008 New Revision: 44184 URL: http://svn.opensuse.org/viewcvs/yast?rev=44184&view=rev Log: - Better /lbin/wget handling in InstExtensionImage. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/InstExtensionImage.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=44184&r1=44183&r2=44184&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Feb 6 13:24:02 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 6 13:23:35 CET 2008 - locilka@suse.cz + +- Better /lbin/wget handling in InstExtensionImage. + +------------------------------------------------------------------- Tue Feb 5 16:04:15 CET 2008 - locilka@suse.cz - Squashfs image needs to be mounted using '-o loop'. Modified: trunk/installation/src/modules/InstExtensionImage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstExtensionImage.ycp?rev=44184&r1=44183&r2=44184&view=diff ============================================================================== --- trunk/installation/src/modules/InstExtensionImage.ycp (original) +++ trunk/installation/src/modules/InstExtensionImage.ycp Wed Feb 6 13:24:02 2008 @@ -311,9 +311,20 @@ return true; } + string wget_logging_file = sformat ("%1/wget_logging_file", Directory::tmpdir); + // Downloading the extension - string cmd = sformat ("/lbin/wget -v '%1' '%2'", String::Quote (extension_url), String::Quote (extension_localfile)); + string cmd = sformat ( + "echo -n > '%3'; /lbin/wget -v '%1' '%2' 1>>'%3' 2>>'%3'", + String::Quote (extension_url), + String::Quote (extension_localfile), + String::Quote (wget_logging_file) + ); map cmd_run = (map) WFM::Execute (.local.bash_output, cmd); + y2milestone ( + "Downloading extension image:\n--- downloading ---\n%1--- downloading ---", + (string) WFM::Read (.local.string, wget_logging_file) + ); if (cmd_run["exit"]:-1 != 0 || ! FileUtils::Exists (extension_localfile)) { y2error ("Cannot download extension '%1': %2", cmd, cmd_run); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org