Author: kmachalkova Date: Thu May 29 15:51:12 2008 New Revision: 47945 URL: http://svn.opensuse.org/viewcvs/yast?rev=47945&view=rev Log: Make these understand `result command sent by y2base to the agent in order to terminate it correctly (#393957) Modified: trunk/apparmor/src/agents/ag_subdomain trunk/apparmor/src/agents/ag_subdomain_profiles Modified: trunk/apparmor/src/agents/ag_subdomain URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_subdomain?... ============================================================================== --- trunk/apparmor/src/agents/ag_subdomain (original) +++ trunk/apparmor/src/agents/ag_subdomain Thu May 29 15:51:12 2008 @@ -97,11 +97,16 @@ $donereturn = 1; } ycp::ycpReturnSkalarAsString( $result ) if ( ! $donereturn ); - } else { - my $ycpCmd = ycpGetCommand() || ""; - my $ycpArg = ycpGetArgType() || ""; - $result = "Unknown instruction $ycpCmd or argument: $ycpArg\n"; - ycp::ycpReturnSkalarAsString( $result ); + } + else { + #ycpGetCommand and ycpGetArgType is obsolete, we have those + #from ycp::ParseCommand + if ($command eq "result") { + exit 0; + } else { + $result = "Unknown instruction $command or argument: $argument\n"; + ycp::ycpReturnSkalarAsString( $result ); + } } print "\n"; } Modified: trunk/apparmor/src/agents/ag_subdomain_profiles URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_subdomain_... ============================================================================== --- trunk/apparmor/src/agents/ag_subdomain_profiles (original) +++ trunk/apparmor/src/agents/ag_subdomain_profiles Thu May 29 15:51:12 2008 @@ -129,11 +129,14 @@ } } } else { - - my $ycpCmd = ycpGetCommand() || ""; - my $ycpArg = ycpGetArgType() || ""; - $result = "Unknown instruction $ycpCmd or argument: $ycpArg\n"; - ycp::Return( $result ); + #ycpGetCommand and ycpGetArgType is obsolete, we have those + #from ycp::ParseCommand + if ($command eq "result") { + exit 0; + } else { + $result = "Unknown instruction $command or argument: $argument\n"; + ycp::Return( $result ); + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org