This is an automated email from the git hooks/post-receive script. micove-guest pushed a commit to branch master in repository pcsx2.
commit f5c2a864cf7067a90cf3a4448cba24a15d4b5fa2 Author: Miguel A. Colón Vélez <[email protected]> Date: Thu Oct 1 17:23:29 2015 -0400 Update get-orig-source routine. - Add VER_SUFFIX - Fix the case of using VER=1.2.1 which finds tag v1.2.1 and then tries to checkout 1.2.1 instead of v1.2.1 or UPSTREAM_SHA1. Git-Dch: Ignore --- debian/get-git-source.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/get-git-source.sh b/debian/get-git-source.sh index 8359974..0d65b1a 100755 --- a/debian/get-git-source.sh +++ b/debian/get-git-source.sh @@ -4,6 +4,7 @@ set -e PACKAGE=pcsx2 giturl=https://github.com/PCSX2/pcsx2.git +VER_SUFFIX="+dfsg" CWD_DIR=${PWD} GOS_DIR=${CWD_DIR}/get-orig-source @@ -34,7 +35,9 @@ gos_verify_version () { } gos_override_changelog_version () { - UPSTREAM_SHA1="${1}" + if [ -z "${UPSTREAM_SHA1}" ]; then + UPSTREAM_SHA1=master + fi cd ${GOS_DIR}/${DEB_SOURCE}-${UPSTREAM_VERSION} echo "Using git checkout ${UPSTREAM_SHA1}" # Rename directory since UPSTREAM_VERSION is invalid. @@ -58,17 +61,16 @@ git clone --no-checkout ${giturl} ${DEB_SOURCE}-${UPSTREAM_VERSION} if [ -z "${VER}" ]; then gos_verify_version ${UPSTREAM_VERSION} if [ -z "${UPSTREAM_SHA1}" ]; then - gos_override_changelog_version master + gos_override_changelog_version else gos_use_changelog_version fi else gos_verify_version ${VER} - if [ -z "${UPSTREAM_SHA1}" ]; then - gos_override_changelog_version master - else - gos_override_changelog_version ${VER} + if [ -n "${UPSTREAM_SHA1}" ]; then + echo "VER=${VER} maps to commit ${UPSTREAM_SHA1}" fi + gos_override_changelog_version fi # Clean-up... @@ -88,6 +90,6 @@ rm -rf .git* # Packing... cd ${GOS_DIR} find -L ${DEB_SOURCE}-${UPSTREAM_VERSION} -xdev -type f -print | LC_ALL=C sort \ -| XZ_OPT="-6v" tar -caf "${CWD_DIR}/${DEB_SOURCE}_${UPSTREAM_VERSION}+dfsg.orig.tar.xz" -T- --owner=root --group=root --mode=a+rX +| XZ_OPT="-6v" tar -caf "${CWD_DIR}/${DEB_SOURCE}_${UPSTREAM_VERSION}${VER_SUFFIX}.orig.tar.xz" -T- --owner=root --group=root --mode=a+rX cd ${CWD_DIR} && rm -rf ${GOS_DIR} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/pcsx2.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
