Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-05-04 15:46:01 +0200
committerErich Eckner <git@eckner.net>2017-05-04 15:46:01 +0200
commiteb68b12a3baa065e68ce83dff57759a08f60cb9e (patch)
tree06ea64859ad1fe2c2417098fa48fb9004cee8761
parentbc55a8b39392301dcb785c485dbc4f765d7e7e49 (diff)
bin/build-packages: clean up checkout
-rwxr-xr-xbin/build-packages3
-rwxr-xr-xbin/common-functions11
2 files changed, 13 insertions, 1 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 339a8bc..d4fc8b9 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -38,9 +38,10 @@ while true; do
git -C "${repo}" clean -df
git -C "${repo}" checkout master
git -C "${repo}" pull
- git -C "${repo}" checkout "${git_revision}" &> /dev/null || true
done
+ git -C "${repo_paths["$(find_repository_with_commit "${git_revision}")"]}" checkout "${git_revision}" &> /dev/null
+
PKGBUILD="$(find_pkgbuild "${package}" "${repository}")"
if [ ! -r "${PKGBUILD}" ]; then
diff --git a/bin/common-functions b/bin/common-functions
index 2191d01..7b5aa18 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -18,3 +18,14 @@ find_pkgbuild() {
sort | \
tail -n1
}
+
+find_repository_with_commit() {
+ for repository in "${!repo_paths[@]}"; do
+ if [ "$(git -C "${repo_paths["${repository}"]}" cat-file -t "$1")" == "commit" ]; then
+ echo "${repository}"
+ return 0
+ fi
+ done
+ >&2 echo "can't find repository with commit '$1'"
+ exit 1
+}