This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 6a00270 bin/sbuild-deb-package: add more quotes to the git checkout code. new bf5aa28 bin/sbuild-deb-package: create local branches for upstream/* branches and make sure that (most) branches we fetch are actually deleted before a fetch operation. new 23dae32 bin/sbuild-deb-package: quoting changes only. new 5291424 bin/sbuild-deb-package: branch delete operations are non-fatal. new f2a4fdf bin/sbuild-deb-package: quoting changes only. new 32919ba bin/build-rpm-package: port sbuild-deb-package changes over, even though we currently do not use upstream/* branches there. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/build-rpm-package | 18 +++++++++++++----- bin/sbuild-deb-package | 36 +++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 20 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit bf5aa28fea1f18a46556e06999f4b3585d562800 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 17 15:44:30 2018 +0200 bin/sbuild-deb-package: create local branches for upstream/* branches and make sure that (most) branches we fetch are actually deleted before a fetch operation. --- bin/sbuild-deb-package | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 60df9fe..a96ddc5 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -177,8 +177,11 @@ prepare_workspace() { git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" git fetch origin "${CHECKOUT}" git reset --hard "origin/${CHECKOUT}" + git branch -D 'upstream' || true git fetch origin 'upstream:upstream' || true - git fetch origin 'upstream/*:upstream/*' || true + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" + git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git branch -D 'pristine-tar' git fetch origin 'pristine-tar:pristine-tar' || true # and again, get the ${CHECKOUT} refspec in pure state git reset --hard @@ -193,8 +196,11 @@ prepare_workspace() { cd "${PROJECT}" git fetch origin "${CHECKOUT}" git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" + git branch -D 'upstream' || true git fetch origin 'upstream:upstream' || true - git fetch origin 'upstream/*:upstream/*' || true + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" + git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git branch -D 'pristine-tar' git fetch origin 'pristine-tar:pristine-tar' || true git clean -df } || { @@ -347,7 +353,7 @@ build_packages() { # Before actually running git archive, we'd better fetch the branch first, in case it's new. # Failures to do so are fatal now. - git fetch origin "upstream/${UPSTREAM_VERSION}:upstream/${UPSTREAM_VERSION}" + git fetch origin "refs/heads/upstream/${UPSTREAM_VERSION}:refs/heads/upstream/${UPSTREAM_VERSION}" git archive --prefix="${PROJECT}-${UPSTREAM_VERSION}/" -o "../${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz" "upstream/${UPSTREAM_VERSION}" && { SA_OPTION="--debbuildopts=-sa" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 23dae321627ef5a8cb1b6e695200e34da4d74a55 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 17 15:44:48 2018 +0200 bin/sbuild-deb-package: quoting changes only. --- bin/sbuild-deb-package | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index a96ddc5..19461ad 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -332,14 +332,14 @@ build_packages() { cd "${PROJECT_DIR}" git clone --no-hardlinks --no-local "${PROJECT_DIR}" "${TEMP_DIR}/${PROJECT}/" cd "${TEMP_DIR}/${PROJECT}" - git checkout "${CHECKOUT}" || git checkout master + git checkout "${CHECKOUT}" || git checkout 'master' find "${PROJECT_DIR}/../" -maxdepth 0 -mindepth 0 -type f | grep -qs "${PROJECT}_"*.orig.tar.gz && cp -- "${PROJECT_DIR}/../${PROJECT}_"*.orig.tar.gz .. GITREV="$(gitrevno)" # we always build native packages for our repos SA_OPTION="" test -f "debian/source/format" && grep -Eqs '^3.0.*\(quilt\)$' "debian/source/format" && { - git fetch origin upstream:upstream || true + git fetch 'origin' 'upstream:upstream' || true # Short explanation for replacing tilde characters with underscores: # Yes, they are legit characters in a version string, but that's where the fun ends. # Since we expect the non-modified version to be available as a branch called "upstream/#{UPSTREAM_VERSION}" @@ -348,16 +348,16 @@ build_packages() { # underscore character, because that sounds most sensible (keeps the string length intact # and actually shows the substitution to observant readers). # ┌ remove epoch ┌ remove debian rev ┌ replace tilde characters with underscores - UPSTREAM_VERSION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/^.*://' -e 's/-[^-]*$//' -e 's/~/_/g')" - REVISION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/.*-//')" + UPSTREAM_VERSION="$(dpkg-parsechangelog | grep 'Version:' | cut -d ' ' -f2 | sed -e 's/^.*://' -e 's/-[^-]*$//' -e 's/~/_/g')" + REVISION="$(dpkg-parsechangelog | grep 'Version:' | cut -d ' ' -f2 | sed -e 's/.*-//')" # Before actually running git archive, we'd better fetch the branch first, in case it's new. # Failures to do so are fatal now. git fetch origin "refs/heads/upstream/${UPSTREAM_VERSION}:refs/heads/upstream/${UPSTREAM_VERSION}" git archive --prefix="${PROJECT}-${UPSTREAM_VERSION}/" -o "../${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz" "upstream/${UPSTREAM_VERSION}" && { - SA_OPTION="--debbuildopts=-sa" - } || echo "1.0" > "debian/source/format" + SA_OPTION='--debbuildopts=-sa' + } || echo '1.0' > "debian/source/format" } if [ -n "${BASH_VERSINFO[0]}" ] && [ "${BASH_VERSINFO[0]}" -gt 3 ]; then -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 5291424b7cc5bd212cbb4a23631a28ed548a8275 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 17 15:46:25 2018 +0200 bin/sbuild-deb-package: branch delete operations are non-fatal. --- bin/sbuild-deb-package | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 19461ad..06f23fc 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -179,9 +179,9 @@ prepare_workspace() { git reset --hard "origin/${CHECKOUT}" git branch -D 'upstream' || true git fetch origin 'upstream:upstream' || true - git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true - git branch -D 'pristine-tar' + git branch -D 'pristine-tar' || true git fetch origin 'pristine-tar:pristine-tar' || true # and again, get the ${CHECKOUT} refspec in pure state git reset --hard @@ -198,9 +198,9 @@ prepare_workspace() { git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" git branch -D 'upstream' || true git fetch origin 'upstream:upstream' || true - git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true - git branch -D 'pristine-tar' + git branch -D 'pristine-tar' || true git fetch origin 'pristine-tar:pristine-tar' || true git clean -df } || { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit f2a4fdf45e290cf76b8e0544d71675e0d0973261 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 17 15:47:46 2018 +0200 bin/sbuild-deb-package: quoting changes only. --- bin/sbuild-deb-package | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 06f23fc..f49bf8b 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -175,14 +175,14 @@ prepare_workspace() { cd "${PROJECT_DIR}" && { git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" - git fetch origin "${CHECKOUT}" + git fetch 'origin' "${CHECKOUT}" git reset --hard "origin/${CHECKOUT}" git branch -D 'upstream' || true - git fetch origin 'upstream:upstream' || true + git fetch 'origin' 'upstream:upstream' || true git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true - git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true git branch -D 'pristine-tar' || true - git fetch origin 'pristine-tar:pristine-tar' || true + git fetch 'origin' 'pristine-tar:pristine-tar' || true # and again, get the ${CHECKOUT} refspec in pure state git reset --hard git clean -df @@ -194,14 +194,14 @@ prepare_workspace() { cd "$(dirname "${PROJECT_DIR}")" && { git clone "git://${GIT_HOSTNAME}/${PROJECT_PATH}.git" cd "${PROJECT}" - git fetch origin "${CHECKOUT}" + git fetch 'origin' "${CHECKOUT}" git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" git branch -D 'upstream' || true - git fetch origin 'upstream:upstream' || true + git fetch 'origin' 'upstream:upstream' || true git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true - git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true git branch -D 'pristine-tar' || true - git fetch origin 'pristine-tar:pristine-tar' || true + git fetch 'origin' 'pristine-tar:pristine-tar' || true git clean -df } || { echo "Unable to switch to project directory \"$(dirname "${PROJECT_DIR}")\". Does it exist? Check the permissions." >&2 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 32919ba1076136435c7ebcd82fe0a932ac570ebe Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 17 15:51:26 2018 +0200 bin/build-rpm-package: port sbuild-deb-package changes over, even though we currently do not use upstream/* branches there. --- bin/build-rpm-package | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index e8f0728..88146e2 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -752,10 +752,14 @@ prepare_workspace() { cd "${PROJECT_DIR}" && { git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" - git fetch origin "${CHECKOUT}" + git fetch 'origin' "${CHECKOUT}" git reset --hard "origin/${CHECKOUT}" - git fetch origin upstream:upstream || true - git fetch origin pristine-tar:pristine-tar || true + git branch -D 'upstream' || true + git fetch 'origin' 'upstream:upstream' || true + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true + git fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git branch -D 'pristine-tar' || true + git fetch 'origin' 'pristine-tar:pristine-tar' || true # and again, get the ${CHECKOUT} refspec in pure state git reset --hard git clean -df @@ -768,8 +772,12 @@ prepare_workspace() { git clone "git://${GIT_HOSTNAME}/${PROJECT_PATH}.git" cd "${PROJECT}" git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" - git fetch origin upstream:upstream || true - git fetch origin pristine-tar:pristine-tar || true + git branch -D 'upstream' || true + git fetch 'origin' 'upstream:upstream' || true + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true + git fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git branch -D 'pristine-tar' || true + git fetch 'origin' 'pristine-tar:pristine-tar' || true git clean -df } || { echo "Unable to switch to project directory \"$(dirname "${PROJECT_DIR}")\". Does it exist? Check the permissions." >&2 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org