rel-eng/push-packages-to-fedora.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
New commits: commit 5bd9f5eb5035bc209f78a77b19d94e53af5f4c6d Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jan 2 16:20:23 2012 +0100
do not tag spacewalk-backend package
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index c63abf7..3222c28 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -46,15 +46,15 @@ for package in $PACKAGE_LIST; do echo "Importing version: $NVR_GIT" fedpkg import $SRC_RPM || exit $? fedpkg commit -m "Rebase to $BASENAME in rawhide." - fedpkg tag -c echo "Review your changes and hit ENTER to continue or Ctrl+C to stop" read git push || ( echo 'Error: could not push changes' && exit 1 ) - git push --tags if [ $package == "spacewalk-backend" ]; then echo "WARNING: please manualy comment out subpackage spacewalk-backend-sql-oracle in fedora dist-git and build the package. Hit ENTER to continue" read else + fedpkg tag -c + git push --tags fedpkg build --nowait fi else
commit de9cdd9013c057fcdeb4f5d42bb59f353b5fffbf Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jan 2 16:19:21 2012 +0100
use fedpkg tag instead of git tag $BASENAME
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index 862f717..c63abf7 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -46,7 +46,7 @@ for package in $PACKAGE_LIST; do echo "Importing version: $NVR_GIT" fedpkg import $SRC_RPM || exit $? fedpkg commit -m "Rebase to $BASENAME in rawhide." - git tag $BASENAME + fedpkg tag -c echo "Review your changes and hit ENTER to continue or Ctrl+C to stop" read git push || ( echo 'Error: could not push changes' && exit 1 )
commit 832d3ce533ee6fc131ea62605cbc6a6aa96f22d5 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jan 2 15:33:45 2012 +0100
warn about spacewalk-backend-sql-oracle during import into Fedora
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index d2ddd9c..862f717 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -51,7 +51,12 @@ for package in $PACKAGE_LIST; do read git push || ( echo 'Error: could not push changes' && exit 1 ) git push --tags - fedpkg build --nowait + if [ $package == "spacewalk-backend" ]; then + echo "WARNING: please manualy comment out subpackage spacewalk-backend-sql-oracle in fedora dist-git and build the package. Hit ENTER to continue" + read + else + fedpkg build --nowait + fi else echo "$NVR_DISTGIT already imported - skipping." fi
commit 1734d670d7667cc9984cabccd7bbc70a7b3c4873 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jan 2 15:29:35 2012 +0100
705363 - add spacewalk-web to list of packages to automaticaly import to Fedora
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index 2f83f04..d2ddd9c 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -7,7 +7,7 @@ TOP_DIR_FEDORA=$1 # top dir of spacewalk git checkout TOP_DIR_GIT=$2
-PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream" +PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream spacewalk-web"
if [ -z "$TOP_DIR_FEDORA" -o ! -d "$TOP_DIR_FEDORA" ]; then