From bfc69b2cd5b771b6483c6e9b95ea36f6f9d82cda Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 22 Nov 2017 22:44:50 +0100
Subject: bin/build-packages, bin/common-functions: accept and respect
 sub_pkgrel from get-assignment

---
 bin/build-packages | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'bin/build-packages')

diff --git a/bin/build-packages b/bin/build-packages
index bb1a5be..4f455b3 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -180,12 +180,22 @@ while [ "${count}" -ne 0 ]; do
     0)
       [ ${count} -gt 0 ] && \
         count=$((count-1))
+      sub_pkgrel="${package##* }"
+      package="${package% *}"
       repository="${package##* }"
       package="${package% *}"
       mod_git_revision="${package##* }"
       package="${package% *}"
       git_revision="${package##* }"
-      package="${package% *}"
+      if [ "${git_revision}" = "${package}" ]; then
+        # build master did not tell us a sub_pkgrel
+        git_revision="${mod_git_revision}"
+        mod_git_revision="${repository}"
+        repository="${sub_pkgrel}"
+        sub_pkgrel='0'
+      else
+        package="${package% *}"
+      fi
 
       if [ "${git_revision##*-}" = 'HEAD' ]; then
         git_revision=$(
@@ -233,7 +243,7 @@ while [ "${count}" -ne 0 ]; do
       tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
       trap bail_out EXIT
 
-      extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}"
+      extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}" "${sub_pkgrel}"
 
       cd "${tmp_dir}"
       success=false
-- 
cgit v1.2.3-70-g09d2