rpms/openldap/FC-6 openldap.spec,1.64,1.65
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 23 06:48:20 UTC 2007
Author: jsafrane
Update of /cvs/dist/rpms/openldap/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26639
Modified Files:
openldap.spec
Log Message:
Do not delete database in %preun if there is update in progress (bz#230959)
Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openldap.spec 28 Nov 2006 22:28:41 -0000 1.64
+++ openldap.spec 23 Apr 2007 06:48:18 -0000 1.65
@@ -599,21 +599,20 @@
if [ "$1" = "0" ] ; then
/sbin/service ldap stop > /dev/null 2>&1 || :
/sbin/chkconfig --del ldap
-fi
-# See if slapd has been configured and (ever) started
-files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
-if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
- # Save an ldif of the database where the "% post servers" scriptlet can
- # restore it. Also save the database files to a "rpmorig" directory
- # Just In Case (TM)
- if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
- if [ -s /var/lib/ldap/upgrade.ldif ] ; then
- /bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
- mkdir /var/lib/ldap/rpmorig
- mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
- cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
- else
- /bin/rm -f /var/lib/ldap/upgrade.ldif
+ # See if slapd has been configured and (ever) started
+ files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
+ if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
+ # Save an ldif of the database. Also save the database files to a "rpmorig" directory
+ # Just In Case (TM)
+ if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
+ if [ -s /var/lib/ldap/upgrade.ldif ] ; then
+ /bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+ mkdir /var/lib/ldap/rpmorig
+ mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+ cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+ else
+ /bin/rm -f /var/lib/ldap/upgrade.ldif
+ fi
fi
fi
fi
More information about the fedora-cvs-commits
mailing list