Hello community, here is the log from the commit of package mlocate for openSUSE:Factory checked in at 2014-03-20 07:29:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlocate (Old) and /work/SRC/openSUSE:Factory/.mlocate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mlocate" Changes: -------- --- /work/SRC/openSUSE:Factory/mlocate/mlocate.changes 2014-03-18 14:15:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mlocate.new/mlocate.changes 2014-03-20 07:29:58.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 19 09:09:44 UTC 2014 - [email protected] + +- Also respect the UPDATEDB_ when not running as root in the + cron job. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlocate.cron ++++++ --- /var/tmp/diff_new_pack.gXI1Ac/_old 2014-03-20 07:29:59.000000000 +0100 +++ /var/tmp/diff_new_pack.gXI1Ac/_new 2014-03-20 07:29:59.000000000 +0100 @@ -26,24 +26,24 @@ # Compat code for including variables from findutils-locate # where the values were store in /etc/sysconfig/locate - if [ -n ${UPDATEDB_PRUNEFS} ] ; then - UPDATEDB_PRUNEFS="--add-prunefs ${UPDATEDB_PRUNEFS}" + if [ -n "${UPDATEDB_PRUNEFS}" ] ; then + UPDATEDB_PRUNEFS="--add-prunefs=\"${UPDATEDB_PRUNEFS}\"" fi - if [ -n ${UPDATEDB_PRUNEPATHS} ] ; then - UPDATEDB_PRUNEPATHS="--add-prunepaths ${UPDATEDB_PRUNEPATHS}" + if [ -n "${UPDATEDB_PRUNEPATHS}" ] ; then + UPDATEDB_PRUNEPATHS="--add-prunepaths=\"${UPDATEDB_PRUNEPATHS}\"" fi fi # check if user said he want the db generated -if [ -z "$RUN_UPDATEDB" ] || [ "$RUN_UPDATEDB" != "yes" ] ; then +if [ -z "${RUN_UPDATEDB}" ] || [ "${RUN_UPDATEDB}" != "yes" ] ; then exit 0 fi # check the config file NODEVS="" if [ ! -f /etc/updatedb.conf ]; then - NODEVS=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" { print $2 }') + NODEVS="-f $(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" { print $2 }')" fi # alter the priority of the updatedb process @@ -60,10 +60,10 @@ # change the perms to the var directory to our desired user chown -R "${RUN_UPDATEDB_AS}":root /var/lib/mlocate # change the user and run the updatedb under it - /usr/bin/su "${RUN_UPDATEDB_AS}" -c /usr/bin/updatedb -- -f "${NODEVS}" + /usr/bin/su "${RUN_UPDATEDB_AS}" -c "/usr/bin/updatedb ${NODEVS} ${UPDATEDB_PRUNEFS} ${UPDATEDB_PRUNEPATHS}" else # just run it as root - /usr/bin/updatedb -f "${NODEVS}" "${UPDATEDB_PRUNEFS}" "${UPDATEDB_PRUNEPATHS}" + /usr/bin/updatedb "${NODEVS}" "${UPDATEDB_PRUNEFS}" "${UPDATEDB_PRUNEPATHS}" fi else echo >&2 "Warning: \"/usr/bin/updatedb\" is not executable, unable to run updatedb." -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
