This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 03e7b65b0173ae1ee9e3a5f326eef04596da3b14 (commit) via 15e38431b97baeada58f279b62a0cbfb609230a7 (commit) from f56c0f6c774a442da3f85ec590bb75632abd5dca (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 03e7b65b0173ae1ee9e3a5f326eef04596da3b14 Merge: 15e3843 f56c0f6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 16 11:08:01 2014 +0100

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 15e38431b97baeada58f279b62a0cbfb609230a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 16 11:06:49 2014 +0100

Fix sourecode upload.

-----------------------------------------------------------------------

Summary of changes: make.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

Difference in files: diff --git a/make.sh b/make.sh index 5d12665..cb04763 100755 --- a/make.sh +++ b/make.sh @@ -1083,11 +1083,11 @@ uploadsrc) fi

URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }') - REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) + REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})

- cd $BASEDIR/cache/ - for file in $(ls -1 --ignore=toolchains); do - grep -q "$file" <<<$REMOTE_FILES && continue + for file in ${BASEDIR}/cache/*; do + [ -d "${file}" ] && continue + grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue NEW_FILES="$NEW_FILES $file" done [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}

hooks/post-receive -- IPFire 2.x development tree