From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SBOpd-00030r-0o for garchives@archives.gentoo.org; Sat, 24 Mar 2012 11:08:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2731E0605; Sat, 24 Mar 2012 11:08:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7B2EBE0605 for ; Sat, 24 Mar 2012 11:08:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B97EB1B4029 for ; Sat, 24 Mar 2012 11:08:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 85200E5403 for ; Sat, 24 Mar 2012 11:08:10 +0000 (UTC) From: "Markos Chandras" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markos Chandras" Message-ID: <1332587131.8fee2710196f88c6521092c45098108ca32f2cfd.hwoarang@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/qt X-VCS-Files: Documentation/maintainers/bump-python-revisions X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: hwoarang X-VCS-Committer-Name: Markos Chandras X-VCS-Revision: 8fee2710196f88c6521092c45098108ca32f2cfd X-VCS-Branch: master Date: Sat, 24 Mar 2012 11:08:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3fc75e2a-5c8c-4b43-80ba-631a008990b0 X-Archives-Hash: 95fb4c971d5a5b3c5ceb3c0d7ecf5ba7 commit: 8fee2710196f88c6521092c45098108ca32f2cfd Author: Markos Chandras gentoo org> AuthorDate: Sat Mar 24 11:05:31 2012 +0000 Commit: Markos Chandras gentoo org> CommitDate: Sat Mar 24 11:05:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D8fee2710 maintainers/bump-python-revisions: Clean up and a few fixes --- Documentation/maintainers/bump-python-revisions | 53 ++++++++++++-----= ------ 1 files changed, 28 insertions(+), 25 deletions(-) diff --git a/Documentation/maintainers/bump-python-revisions b/Documentat= ion/maintainers/bump-python-revisions index f0528fe..1eb6fc6 100755 --- a/Documentation/maintainers/bump-python-revisions +++ b/Documentation/maintainers/bump-python-revisions @@ -1,4 +1,7 @@ #!/bin/bash + +set -e + source /etc/init.d/functions.sh =20 ########################## VARIABLES ############################ @@ -64,23 +67,26 @@ dopyqt4(){ =20 =20 commit() { -ewarn "Your changes are ready to be merged. However I strongly recommend= you to review your changes." -ewarn "" -einfo "Press 'r' to review your changes or 'y' to merge them to master b= ranch (default 'r')." -read choice -case "$choice" in - y) ewarn "Your changes will be merged now. Don't break the = overlay or I will shoot you down!" - git commit -a -m "PyQt4/sip: Automatic version bump, remove old" || ex= it 2 - git push || exit 2 - ;; -=09 - r|"") git diff - ;; - *) eerror "" - eerror "Invalid option. Are you stupid or something?" - eerror "" - exit 3 -esac + ewarn "Your changes are ready to be merged. However I strongly recommen= d you to review your changes." + ewarn "" + einfo "Press 'r' to review your changes or 'y' to merge them to master = branch (default 'r')." + read choice + case "$choice" in + y) =20 + ewarn "Your changes will be merged now. Don't break the overlay or I = will shoot you down!" + git commit -a -m "PyQt4/sip: Automatic version bump, remove old" || e= xit 2 + git push || exit 2 + ;; + r|"") + git diff + ;; + *)=09 + eerror "" + eerror "Invalid option. Are you stupid or something?" + eerror "" + exit 3 + esac + } =20 getrevisions(){ @@ -105,17 +111,14 @@ getrevisions(){ [[ ${pyqt4_revision} !=3D ${new_pyqt4} ]] && dopyqt4 && FOUND=3Dtrue; [[ ${sip_revision} !=3D ${new_sip} ]] && dosip && FOUND=3Dtrue; =20 - if [[ -n $FOUND ]]; then + if [[ -n ${FOUND} ]]; then commit # clean up - ebegin "Cleaning up tarballs..." - rm ${TEMP}/${SIPKG}.tar.gz || exit - rm ${TEMP}/${PYPKG}.tar.gz || exit - rm -r ${TEMP} dst=3D$(portageq envvar DISTDIR) - rm ${dst}/${SIPKG}.tar.gz - rm ${dst}/${PYPKG}.tar.gz - eend $? + einfo "Cleaning up tarballs..." + [[ -n ${SIPKG} ]] && rm ${TEMP}/${SIPKG}.tar.gz && rm ${dst}/${SIPKG}.= tar.gz + [[ -n ${PYPKG} ]] && rm ${TEMP}/${PYPKG}.tar.gz && rm ${dst}/${PYPKG}.= tar.gz + rm -r ${TEMP} fi exit 0 =20