[PATCH 08/20] - quoted log messages properly

Tim Niemeyer tim.niemeyer at mastersword.de
Do Jul 16 19:27:49 CEST 2015


Hi Steffen

Am Mittwoch, den 15.07.2015, 21:47 +0200 schrieb Steffen Pankratz:
> Signed-off-by: Steffen Pankratz <kratz00 at gmx.de>

Wenn du das Escapezeichen noch fixt:
Reviewed-by: Tim Niemeyer <tim.niemeyer at mastersword.de>

Kann ich sonst auch gern beim applyen fixen.

> ---
>  buildscript | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index 6c79269..4ba47b0 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -39,23 +39,23 @@ checkout_git(){
>  	local COMMITID=$3
>  
>  	local MYGIT="git -C $DIRECTORY"
> -	echo checking out $REPO_URL to $DIRECTORY in version $COMMITID
> +	echo "checking out $REPO_URL to $DIRECTORY in version $COMMITID"
>  	if [ -d $DIRECTORY ]; then
>  		if $MYGIT remote -v | grep $REPO_URL ; then
> -			echo Right remote detected
> +			echo "Right remote detected"
>  			if ! $MYGIT checkout $COMMITID ; then
> -				echo commitid not found trying to fetch new commits
> +				echo "commitid not found trying to fetch new commits"
>  				$MYGIT	pull && $MYGIT checkout $COMMITID
>  			fi
>  		else
> -			echo wrong remote or not an git repo at all -\> deleting whole directory
> +			echo "wrong remote or not an git repo at all -\> deleting whole directory"
Hier müsste das Escapezeichen jetzt weg.

>  			/bin/rm -rf $DIRECTORY
>  			#needs to be without -C!!!
>  			git clone $REPO_URL $DIRECTORY
>  			$MYGIT checkout $COMMITID
>  		fi
>  	else
> -		echo We need to do a fresh checkout
> +		echo "We need to do a fresh checkout"
>  		#needs to be without -C!!!
>  		git clone $REPO_URL $DIRECTORY
>  		$MYGIT checkout $COMMITID
> @@ -85,7 +85,7 @@ get_source() {
>  		# Patches for feeds could be stored in known directories like build_patches/$NAME/
>  		# That way multiple patches for one feed could be supported
>  		if [ ! -z "$PATCH" ] ; then
> -			echo Patching $PATCH
> +			echo "Patching $PATCH"
>  			git -C $NAME am --whitespace=nowarn $PATCH
>  		fi
>  	done
> @@ -109,11 +109,11 @@ prepare() {
>  	for FEEDVAR in ${FEEDS[@]} ; do
>  		FEED=$FEEDVAR[@] FEED=( ${!FEED} )
>  		local NAME=${FEED[0]}
> -		echo adding $NAME to package feeds
> +		echo "adding $NAME to package feeds"
>  		echo src-link $NAME $PACKAGEBASE/$NAME >> $target/feeds.conf
>  	done
>  
> -	echo cleaning feeds
> +	echo "cleaning feeds"
>  	/bin/rm -rf $target/feeds
>  
>  	$target/scripts/feeds update
> @@ -124,7 +124,7 @@ prepare() {
>  		local PACKAGESVAR=${FEEDVAR}_PKGS
>  
>  		if [[ -n "${!PACKAGESVAR}" ]] ; then
> -			echo adding ${!PACKAGESVAR} from feed $NAME to available packages
> +			echo "adding ${!PACKAGESVAR} from feed $NAME to available packages"
Das hat jetzt hier mit diesem Patch nichts zu tun, aber es fällt einfach
auf. Ui, wtf.. Wie ist das denn da rein gekommen. Da werd ich n Patch
schicken.

Tim
>  			$target/scripts/feeds install -p $NAME ${!PACKAGESVAR}
>  		fi
>  	done
> -- 
> 2.4.5
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 819 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20150716/d028abb3/attachment-0002.sig>


Mehr Informationen über die Mailingliste franken-dev