| 1 |
commit: 0605a75e3a426a1245900be171ae0f69fb743c7d |
| 2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 3 08:59:01 2015 +0000 |
| 4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 3 08:59:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=0605a75e |
| 7 |
|
| 8 |
tweak pull push a bit and pull just before pushing to avoid conflicts |
| 9 |
|
| 10 |
Signed-off-by: Markus Meier <maekke <AT> gentoo.org> |
| 11 |
|
| 12 |
scripts/keyword.sh | 2 +- |
| 13 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/scripts/keyword.sh b/scripts/keyword.sh |
| 16 |
index e18f3a5..59629bd 100755 |
| 17 |
--- a/scripts/keyword.sh |
| 18 |
+++ b/scripts/keyword.sh |
| 19 |
@@ -66,7 +66,6 @@ for pkg in ${pkgs} ; do |
| 20 |
[[ -n "${revision}" ]] && version="${version}-${revision}" |
| 21 |
|
| 22 |
cd "${REPODIR}/${cpn}" || die "package ${cpn} not found" |
| 23 |
- git pull --rebase=preserve || die "git pull failed" |
| 24 |
[[ -e ${pn}-${version}.ebuild ]] || die "ebuild (${pn}-${version}) not found" |
| 25 |
repoman full --include-arches "${arches//\~/}" || die "repoman full failed on non-modified tree" |
| 26 |
|
| 27 |
@@ -91,6 +90,7 @@ for pkg in ${pkgs} ; do |
| 28 |
repoman manifest || die "repoman manifest failed" |
| 29 |
repoman full --include-arches "${arches//\~/}" || die "repoman full failed on modified tree" |
| 30 |
repoman commit --include-arches "${arches//\~/}" -m "${msg}" || die "repoman commit failed" |
| 31 |
+ git pull --rebase=preserve || die "git pull failed" |
| 32 |
git push --signed || die "git push failed" |
| 33 |
else |
| 34 |
echo "nothing to do here" |
Archives