[Pkg-openldap-devel] OpenLDAP 2.4.7

[Steve Langasek]

On Fri, Jan 11, 2008 at 07:20:23PM -0800, Russ Allbery wrote:
> Steve Langasek <vorlon at debian.org> writes:

> > @@ -489,13 +501,17 @@
> >  		}
> >  
> >  		$config = shift;
> > -		changeConfig ($config);'
> > +		changeConfig ($config);
> > +		exit $has_replica;'
> >  
> >  	echo -n "  Upgrading BDB 'checkpoint' options... " >&2
> >  
> >  	perl -e "$script" $SLAPD_CONF
> > +	result=$?

> set -e is going to make you sad here, no?  I think this has to be:

> result=0
> if perl -e "$script" $SLAPD_CONF ; then
>     result=0
> else
>     result=1
> fi

Ah, actually I think this hits a strange case where set -e does not force
immediate return from a function on non-zero exit.  But we can clean it up
anyway, sure.

> > Index: debian/slapd.templates
> > ===================================================================
> > --- debian/slapd.templates	(revision 968)
> > +++ debian/slapd.templates	(working copy)
> > @@ -181,3 +181,16 @@
> >   features to offer transaction processing, fine grained locking, and other
> >   features that offer improved concurrency and reliability. For more
> >   information, see /usr/share/doc/slapd/README.DB_CONFIG.gz
> > +
> > +Template: slapd/slurpd_obsolete
> > +Type: note
> 
> error.

Right, changed.

Updated patch attached; does this look good to commit?

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: slurpd-obsoleted.patch
Type: text/x-diff
Size: 4524 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-openldap-devel/attachments/20080112/58d4bf68/attachment.patch