do-rebase: use centpkg instead of fedpkg for centos rebases
Related: rhbz#1940165 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
parent
583bcec955
commit
294df22ef5
@ -160,14 +160,14 @@ git rm -q 0*.patch
|
|||||||
#othergit diff --full-index --binary $diff_ops grub-2.04..refs/remotes/rhboot/master > release-to-master.patch
|
#othergit diff --full-index --binary $diff_ops grub-2.04..refs/remotes/rhboot/master > release-to-master.patch
|
||||||
#git add release-to-master.patch
|
#git add release-to-master.patch
|
||||||
|
|
||||||
fedpkg sources
|
centpkg sources
|
||||||
curl -L https://github.com/rhboot/gnulib/archive/fixes.tar.gz > gnulib-fixes.tar.gz.new
|
curl -L https://github.com/rhboot/gnulib/archive/fixes.tar.gz > gnulib-fixes.tar.gz.new
|
||||||
if cmp -s gnulib-fixes.tar.gz gnulib-fixes.tar.gz.new; then
|
if cmp -s gnulib-fixes.tar.gz gnulib-fixes.tar.gz.new; then
|
||||||
rm gnulib-fixes.tar.gz.new
|
rm gnulib-fixes.tar.gz.new
|
||||||
else
|
else
|
||||||
mv gnulib-fixes.tar.gz.new gnulib-fixes.tar.gz
|
mv gnulib-fixes.tar.gz.new gnulib-fixes.tar.gz
|
||||||
sed -i -e '/gnulib-/d' sources
|
sed -i -e '/gnulib-/d' sources
|
||||||
fedpkg upload gnulib-fixes.tar.gz
|
centpkg upload gnulib-fixes.tar.gz
|
||||||
git add sources
|
git add sources
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -182,7 +182,7 @@ fi
|
|||||||
git add 0*.patch grub2.spec grub.patches
|
git add 0*.patch grub2.spec grub.patches
|
||||||
if [[ ${commit} -eq 1 ]] ; then
|
if [[ ${commit} -eq 1 ]] ; then
|
||||||
if [ -z "$amend" ]; then
|
if [ -z "$amend" ]; then
|
||||||
fedpkg commit -s -c
|
centpkg commit -s -c
|
||||||
else
|
else
|
||||||
git commit --amend
|
git commit --amend
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user