From 5fa8138ee720279b8c40751ccb1715dd066d3eee Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 5 May 2017 15:29:29 +0200
Subject: bin/build-packages, bin/return-assignment: adopt to new format of
 build-list

---
 bin/build-packages | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'bin/build-packages')

diff --git a/bin/build-packages b/bin/build-packages
index 0fc20f7..826b93b 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -5,9 +5,9 @@
 #  https://github.com/archlinux32/builder/wiki/Build-system#build-packages
 
 # TODOs:
-#  include package customizations
 #  use different build commands for different repositories - do we need this actually?
 #  sign packages
+#  send logs of failed builds
 
 . "${0%/*}/../conf/default.conf"
 
@@ -27,6 +27,8 @@ while true; do
     0)
       repository="${package##* }"
       package="${package% *}"
+      mod_git_revision="${package##* }"
+      package="${package% *}"
       git_revision="${package##* }"
       package="${package% *}"
 
@@ -34,11 +36,13 @@ while true; do
 
       for repo in "${repo_paths[@]}"; do
         git -C "${repo}" clean -df
+        git -C "${repo}" reset --hard
         git -C "${repo}" checkout master
         git -C "${repo}" pull
       done
 
       git -C "${repo_paths["$(find_repository_with_commit "${git_revision}")"]}" checkout "${git_revision}" &> /dev/null
+      git -C "${repo_paths["archlinux32"]}" checkout "${mod_git_revision}" &> /dev/null
 
       PKGBUILD="$(find_pkgbuild "${package}" "${repository}")"
 
@@ -58,7 +62,7 @@ while true; do
               -i "${master_build_server_identity}" \
               -p "${master_build_server_port}" \
               "${master_build_server_user}@${master_build_server}" \
-              'return-assignment' "${package}" "${git_revision}" "${repository}"
+              'return-assignment' "${package}" "${git_revision}" "${mod_git_revision}" "${repository}"
           success=true
           break
         fi
@@ -69,9 +73,12 @@ while true; do
           -i "${master_build_server_identity}" \
           -p "${master_build_server_port}" \
           "${master_build_server_user}@${master_build_server}" \
-          'return-assignment' "${package}" "${git_revision}" "${repository}" 'ERROR'
+          'return-assignment' "${package}" "${git_revision}" "${mod_git_revision}" "${repository}" 'ERROR'
       fi
 
+echo 'This is the end.'
+exit 0
+
       continue
 
     ;;
-- 
cgit v1.2.3-54-g00ecf