Hello community, here is the log from the commit of package mlocate for openSUSE:Factory checked in at 2014-03-18 14:15:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-14 15:16:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mlocate.new/mlocate.changes 2014-03-18 14:15:25.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 17 08:44:54 UTC 2014 - [email protected] + +- Move the UPDATEDB_ variables parsing to cron service to have + it working there as the upstream bash config is not exactly + shell interpreted. bnc#861955. +- Sadly this way if user runs updatedb by hand it gets not + properly populated, but at least the cron works with backcompat + way. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlocate.cron ++++++ --- /var/tmp/diff_new_pack.EdoT6M/_old 2014-03-18 14:15:25.000000000 +0100 +++ /var/tmp/diff_new_pack.EdoT6M/_new 2014-03-18 14:15:25.000000000 +0100 @@ -23,11 +23,21 @@ # source the user specified variables if [ -f /etc/sysconfig/locate ] ; then . /etc/sysconfig/locate + + # 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}" + fi + 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 - exit 0 + exit 0 fi # check the config file @@ -53,7 +63,7 @@ /usr/bin/su "${RUN_UPDATEDB_AS}" -c /usr/bin/updatedb -- -f "${NODEVS}" else # just run it as root - /usr/bin/updatedb -f "${NODEVS}" + /usr/bin/updatedb -f "${NODEVS}" "${UPDATEDB_PRUNEFS}" "${UPDATEDB_PRUNEPATHS}" fi else echo >&2 "Warning: \"/usr/bin/updatedb\" is not executable, unable to run updatedb." ++++++ updatedb.conf ++++++ --- /var/tmp/diff_new_pack.EdoT6M/_old 2014-03-18 14:15:25.000000000 +0100 +++ /var/tmp/diff_new_pack.EdoT6M/_new 2014-03-18 14:15:25.000000000 +0100 @@ -14,15 +14,3 @@ # Skip bind mounts. PRUNE_BIND_MOUNTS="yes" - -# Compat code for including variables from findutils-locate -# where the values were store in /etc/sysconfig/locate -if [ -f /etc/sysconfig/locate ] ; then - . /etc/sysconfig/locate - if [ -n ${UPDATEDB_PRUNEFS} ] ; then - PRUNEFS="${PRUNEFS} ${UPDATEDB_PRUNEFS}" - fi - if [ -n ${UPDATEDB_PRUNEPATHS ] ; then - PRUNEPATHS="${PRUNEPATHS} ${UPDATEDB_PRUNEPATHS}" - fi -fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
