[yast-devel] Re: [yast-commit] r64312 - /branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc
On Fri, Jun 10, 2011 at 09:08:26AM -0000, rhafer@svn2.opensuse.org wrote:
Author: rhafer Date: Fri Jun 10 11:08:25 2011 New Revision: 64312
URL: http://svn.opensuse.org/viewcvs/yast?rev=64312&view=rev Log: fixed return value for undefined update referral
Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc
Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc?rev=64312&r1=64311&r2=64312&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 10 11:08:25 2011 @@ -961,10 +961,7 @@ resMap.add( YCPString("target"), YCPString( updateUrl.getHost() ) ); resMap.add( YCPString("port"), YCPInteger( updateUrl.getPort() ) ); } - else - { - resMap.add( YCPString("updateref"), YCPMap() ); - } + resMap = YCPNull(); return resMap; }
This seems wrong, you're overwriting the resMap from the "if" branch. -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu
Am Freitag 10 Juni 2011, 16:37:02 schrieb Martin Vidner: [..]
=================================================================== =========== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigA gent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigA gent.cc Fri Jun 10 11:08:25 2011 @@ -961,10 +961,7 @@
resMap.add( YCPString("target"), YCPString( updateUrl.getHost() ) ); resMap.add( YCPString("port"), YCPInteger( updateUrl.getPort() ) );
}
- else - { - resMap.add( YCPString("updateref"), YCPMap() ); - } + resMap = YCPNull();
return resMap;
}
This seems wrong, you're overwriting the resMap from the "if" branch. Ooops. Yes you are right. Thanks for catching that.
-- Ralf -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
participants (2)
-
Martin Vidner
-
Ralf Haferkamp