diff mbox

Fixed crontab, when root crontabs are empty.

Message ID 1386750492-8919-1-git-send-email-dore@madsdore.dk
State Accepted
Delegated to: Esben Haabendal
Headers show

Commit Message

Mads Doré Hansen Dec. 11, 2013, 8:28 a.m. UTC
---
 classes/image_crontab.oeclass | 4 ++--
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Esben Haabendal Dec. 11, 2013, 10:48 a.m. UTC | #1
Mads Doré Hansen <dore@madsdore.dk> writes:

> ---
>  classes/image_crontab.oeclass | 4 ++--
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/classes/image_crontab.oeclass b/classes/image_crontab.oeclass
> index 32899a5..f1165c6 100644
> --- a/classes/image_crontab.oeclass
> +++ b/classes/image_crontab.oeclass
> @@ -6,8 +6,10 @@ image_preprocess_crontab () {
>  	cwd=`pwd`
>  	test -d $cwd/${crontabdir} || return 0
>  	for f in $cwd/${crontabdir}/*.* ; do
> -		user=`basename $f | cut -d. -f1`
> -		cat $f >> $cwd${crontabdir}/$user
> -		rm $f
> +	  if [ "$f" != "$cwd/${crontabdir}/*.*" ] ; then
> +  	  user=`basename $f | cut -d. -f1`
> +	    cat $f >> $cwd${crontabdir}/$user
> +  		rm $f
> +		fi  
>  	done
>  }

Merged to master, thanks.

/Esben
diff mbox

Patch

diff --git a/classes/image_crontab.oeclass b/classes/image_crontab.oeclass
index 32899a5..f1165c6 100644
--- a/classes/image_crontab.oeclass
+++ b/classes/image_crontab.oeclass
@@ -6,8 +6,10 @@  image_preprocess_crontab () {
 	cwd=`pwd`
 	test -d $cwd/${crontabdir} || return 0
 	for f in $cwd/${crontabdir}/*.* ; do
-		user=`basename $f | cut -d. -f1`
-		cat $f >> $cwd${crontabdir}/$user
-		rm $f
+	  if [ "$f" != "$cwd/${crontabdir}/*.*" ] ; then
+  	  user=`basename $f | cut -d. -f1`
+	    cat $f >> $cwd${crontabdir}/$user
+  		rm $f
+		fi  
 	done
 }