[gentoo-commits] gentoo-x86 commit in sys-apps/slocate: slocate-3.1-r1.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      08/02/04 17:39:20

  Modified:             slocate-3.1-r1.ebuild ChangeLog
  Log:
  When upgrading from slocate-2.x, delete the slocate db as they are incompatible.
  (Portage version: 2.1.4)

Revision  Changes    Path
1.4                  sys-apps/slocate/slocate-3.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?r1=1.3&r2=1.4

Index: slocate-3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- slocate-3.1-r1.ebuild	2 Dec 2007 20:03:13 -0000	1.3
+++ slocate-3.1-r1.ebuild	4 Feb 2008 17:39:19 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.3 2007/12/02 20:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.4 2008/02/04 17:39:19 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -67,6 +67,14 @@
 	fperms 0750 /var/lib/slocate
 }
 
+pkg_preinst() {
+	if has_version '=sys-apps/slocate-2*' ; then
+		rm -f "${ROOT}"/var/lib/slocate/slocate.db
+		ewarn "The slocate database created by slocate-2.x is incompatible"
+		ewarn "with slocate-3.x.  Make sure you run updatedb!"
+	fi
+}
+
 pkg_postinst() {
 	if [[ -f ${ROOT}/etc/cron.daily/slocate.cron ]]; then
 		ewarn "If you merged slocate-2.7.ebuild, please remove"
@@ -74,9 +82,4 @@
 		ewarn "from the filename"
 		echo
 	fi
-	einfo "Note that the /etc/updatedb.conf file is generic"
-	einfo "Please customize it to your system requirements"
-	echo
-	ewarn "The slocate database created by slocate-2.x is incompatible"
-	ewarn "with slocate-3.x.  Make sure you run updatedb!"
 }



1.75                 sys-apps/slocate/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?r1=1.74&r2=1.75

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	2 Dec 2007 20:03:13 -0000	1.74
+++ ChangeLog	4 Feb 2008 17:39:19 -0000	1.75
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/slocate
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.74 2007/12/02 20:03:13 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.75 2008/02/04 17:39:19 vapier Exp $
+
+  04 Feb 2008; Mike Frysinger <vapier@g.o> slocate-3.1-r1.ebuild:
+  When upgrading from slocate-2.x, delete the slocate db as they are
+  incompatible.
 
   02 Dec 2007; Mike Frysinger <vapier@g.o> slocate-2.7-r8.ebuild,
   slocate-3.1-r1.ebuild:



-- 
gentoo-commits@l.g.o mailing list