Hello community, here is the log from the commit of package cron for openSUSE:Factory checked in at Mon May 3 21:24:12 CEST 2010. -------- --- cron/cron.changes 2010-02-19 14:57:44.000000000 +0100 +++ cron/cron.changes 2010-04-30 10:56:20.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 30 10:32:48 UTC 2010 - mseben@novell.com + +- fix in run-crons: don't process empty crondirs (bnc#600569) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cron.spec ++++++ --- /var/tmp/diff_new_pack.RxtUyK/_old 2010-05-03 21:22:24.000000000 +0200 +++ /var/tmp/diff_new_pack.RxtUyK/_new 2010-05-03 21:22:24.000000000 +0200 @@ -28,7 +28,7 @@ AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq Version: 4.1 -Release: 207 +Release: 208 Summary: Cron Daemon Source0: vixie-%name-%version.tar.bz2 Source1: %name.init ++++++ run-crons ++++++ --- /var/tmp/diff_new_pack.RxtUyK/_old 2010-05-03 21:22:24.000000000 +0200 +++ /var/tmp/diff_new_pack.RxtUyK/_new 2010-05-03 21:22:24.000000000 +0200 @@ -30,8 +30,15 @@ # respect MAILTO as cron does # use mktemp -d for all tmpfiles # add variable to disable mail if all jobs returned 0 +# 2010-04-30 - mseben@novell.com +# - in "emtpy dir" check don't search in subdirectories and +# use-maxdepth 1: LIST=`find $CRONDIR -maxdepth 1 ! -type d` +# - added check if SCRIPT exists, to prevent executing SCRIPT expanded +# to e.g. /etc/cron.hourly/* : [ -d $SCRIPT -o ! -e $SCRIPT ] && continue +# (bnc#600569) +# - in $SCRIPT case check, removed unneeded ".svn" dir check : +# droped " .svn) continue ;;" # - # # Don't run jobs on laptops, that are AC-offline # @@ -129,8 +136,8 @@ xargs --no-run-if-empty rm } if test ! -e $SPOOL/$BASE ; then - # accept this dir, if it isn't empty - LIST=`find $CRONDIR ! -type d` + # accept this dir, if it isn't empty, don't search for files in subdirectories + LIST=`find $CRONDIR -maxdepth 1 ! -type d` if [ ! -z "$LIST" ] ; then RUN="${RUN} ${TIME_EXT}" fi @@ -160,9 +167,10 @@ # keep going when something fails set +e for SCRIPT in $CRONDIR/* ; do - test -d $SCRIPT && continue + # skip directories and empty crondir (SCRIPT expanded + # to e.g. /etc/cron.hourly/*) + [ -d $SCRIPT -o ! -e $SCRIPT ] && continue case "$SCRIPT" in - .svn) continue ;; *.rpm*) continue ;; *.swap) continue ;; *.bak) continue ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org