Author: aschnell Date: Mon Mar 17 17:08:31 2008 New Revision: 45540 URL: http://svn.opensuse.org/viewcvs/yast?rev=45540&view=rev Log: - at least make filenames with spaces work Modified: trunk/yast2/library/log/src/LogViewCore.ycp Modified: trunk/yast2/library/log/src/LogViewCore.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/LogViewCore.ycp?rev=45540&r1=45539&r2=45540&view=diff ============================================================================== --- trunk/yast2/library/log/src/LogViewCore.ycp (original) +++ trunk/yast2/library/log/src/LogViewCore.ycp Mon Mar 17 17:08:31 2008 @@ -83,12 +83,13 @@ Report::Error (_("Error occurred while reading the log.")); return; } + string grep = data["grep"]:""; if (grep != "" && grep != nil) grep = sformat ("| grep --line-buffered '%1'", grep); - string lc_command = sformat ("cat %1 %2 | wc -l", data["file"]:"", grep); - map bash_output = (map)SCR::Execute (.target.bash_output, lc_command); - command = "tail -f -n +0 " + data["file"]:""; + string lc_command = sformat ("cat '%1' %2 | wc -l", data["file"]:"", grep); + map bash_output = (map) SCR::Execute (.target.bash_output, lc_command); + command = sformat("tail -f -n +0 '%1'", data["file"]:""); string addon = ""; if (bash_output["exit"]:1 == 0) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org