Author: gs Date: Wed Aug 6 16:26:50 2008 New Revision: 49784 URL: http://svn.opensuse.org/viewcvs/yast?rev=49784&view=rev Log: add error message Modified: trunk/auditd/src/Auditd.ycp trunk/auditd/src/complex.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49784&r1=49783&r2=49784&view=diff ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Wed Aug 6 16:26:50 2008 @@ -441,8 +441,15 @@ sleep(sl); // call auditctl -R audit.rules - success = (boolean)SCR::Execute( .target.bash, "auditctl -R /etc/audit/audit.rules" ); - + map output = (map)SCR::Execute( .target.bash_output, "auditctl -R /etc/audit/audit.rules" ); + + if ( output["exit"]:0 != 0 ) + { + Report::Error( sformat( "%1\n%2", + output["stderr"]:"", + _("Please start yast2-auditd again and check the rules") ) ); + } + if(PollAbort()) return false; return true; } Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49784&r1=49783&r2=49784&view=diff ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Wed Aug 6 16:26:50 2008 @@ -90,9 +90,8 @@ "log_format", "max_log_file", "flush", - "max_log_file_action", - "name_format", - "name"], { + "max_log_file_action" // TODO: add 'name_format' and 'name' + ], { UI::ChangeWidget(`id(key), `Value, (Auditd::GetAuditdOption(key))); }); @@ -130,9 +129,8 @@ "log_format", "max_log_file", "flush", - "max_log_file_action", - "name_format", - "name"], { + "max_log_file_action" // TODO: add 'name_format' and 'name' + ], { Auditd::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); }); y2milestone( "Store logfile settings" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org