Author: jsrain Date: Wed Apr 9 16:40:45 2008 New Revision: 46300 URL: http://svn.opensuse.org/viewcvs/yast?rev=46300&view=rev Log: handle compressed logs properly at the end of first stage installation (fate #300637) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/copy_logs_finish.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=46300&r1=46299&r2=46300&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Apr 9 16:40:45 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 9 16:39:36 CEST 2008 - jsrain@suse.cz + +- handle compressed logs properly at the end of first stage + installation (fate #300637) + +------------------------------------------------------------------- Tue Apr 8 19:40:58 CEST 2008 - locilka@suse.cz - Adjusted control file to sort installation overview via Modified: trunk/installation/src/clients/copy_logs_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/copy_logs_finish.ycp?rev=46300&r1=46299&r2=46300&view=diff ============================================================================== --- trunk/installation/src/clients/copy_logs_finish.ycp (original) +++ trunk/installation/src/clients/copy_logs_finish.ycp Wed Apr 9 16:40:45 2008 @@ -49,7 +49,7 @@ foreach ( string file, log_files, { - if ( file == "y2log" || regexpmatch( file, "y2log-[0-9]+" ) ) + if ( file == "y2log" || regexpmatch( file, "^y2log-[0-9]+$" ) ) { // Prepare y2log, y2log-* for log rotation @@ -60,6 +60,11 @@ InjectRenamedFile( Directory::logdir, file, sformat( "y2log-%1", target_no ) ); } + else if ( regexpmatch (file, "^y2log-[0-9]+\\.gz$")) + { + integer target_no = 1 + tointeger (regexpsub (file, "y2log-([0-9]+)\\.gz", "\\1")); + InjectRenamedFile( Directory::logdir, file, sformat( "y2log-%1.gz", target_no ) ); + } else if ( file == "zypp.log" ) { // Save zypp.log from the inst-sys -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org