[gentoo-commits] gentoo-x86 commit in sys-apps/mlocate/files: mlocate.cron-r2

[Tomas Chvatal (scarabeus)]

scarabeus    11/01/31 13:17:10

  Modified:             mlocate.cron-r2
  Log:
  Fix premature removing of the lock file and parse the args more sanely when there is no config around. This fixes bug #353270.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sys-apps/mlocate/files/mlocate.cron-r2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2?r1=1.3&r2=1.4

Index: mlocate.cron-r2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlocate.cron-r2	30 Jan 2011 13:16:50 -0000	1.3
+++ mlocate.cron-r2	31 Jan 2011 13:17:10 -0000	1.4
@@ -12,13 +12,13 @@
 
 # check if we are already running (lockfile)
 LOCKFILE="/var/lock/mlocate.daily.lock"
-trap "rm -f ${LOCKFILE}" EXIT
 if [ -e "${LOCKFILE}" ]; then
 	echo >&2 "Warning: \"${LOCKFILE}\" already present, not running updatedb."
 	exit 1
-else
-	touch "${LOCKFILE}"
 fi
+touch "${LOCKFILE}"
+# trap the lockfile only if we really run the updatedb
+trap "rm -f ${LOCKFILE}" EXIT
 
 # source the user specified variables
 if [ -f /etc/mlocate-cron.conf ]; then
@@ -26,10 +26,9 @@
 fi
 
 # check the config file
-ARGS=""
+NODEVS=""
 if [ ! -f /etc/updatedb.conf ]; then
-	nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" { print $2 }')
-	ARGS="-f ${nodevs}"
+	NODEVS=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" { print $2 }')
 fi
 
 # alter the priority of the updatedb process
@@ -42,7 +41,7 @@
 
 # run the updatedb if possible
 if [ -x /usr/bin/updatedb ]; then
-	/usr/bin/updatedb ${ARGS}
+	/usr/bin/updatedb -f "${NODEVS}"
 else
 	echo >&2 "Warning: \"/usr/bin/updatedb\" is not executable, unable to run updatedb."
 	exit 0