diff options
| author | Erich Eckner <git@eckner.net> | 2018-09-26 13:52:41 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-09-26 13:52:41 +0200 |
| commit | 9bfb65921767365caa4eee58a588c8dad5e749a2 (patch) | |
| tree | 3e9b857442c3b6b10e8857476b25ca097a668b3a | |
| parent | 70056749977a445e63717f2964e429f2f7643719 (diff) | |
| download | builder-9bfb65921767365caa4eee58a588c8dad5e749a2.tar.xz | |
bin/modify-package-state: $pkgbse.$git_rev.$mod_git_rev.$repo.$arch for source operations
| -rwxr-xr-x | bin/modify-package-state | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/modify-package-state b/bin/modify-package-state index 25b70f2..686a131 100755 --- a/bin/modify-package-state +++ b/bin/modify-package-state @@ -175,6 +175,7 @@ while read -r a b; do # shellcheck disable=SC2016 combiner=$( printf '`build_assignments`' + mysql_join_build_assignments_architectures mysql_join_build_assignments_package_sources mysql_join_package_sources_upstream_repositories mysql_join_build_assignments_binary_packages @@ -184,8 +185,10 @@ while read -r a b; do ) # shellcheck disable=SC2016 selector=$( - repository="${a##*.}" + arch="${a##*.}" pkgbase="${a%.*}" + repository="${pkgbase##*.}" + pkgbase="${pkgbase%.*}" mod_git_revision="${pkgbase##*.}" pkgbase="${pkgbase%.*}" git_revision="${pkgbase##*.}" @@ -193,6 +196,8 @@ while read -r a b; do printf 'WHERE `repository_stabilities`.`name`="unbuilt"' printf ' AND `upstream_repositories`.`name`=from_base64("%s")' \ "$(printf '%s' "${repository}" | base64 -w0)" + printf ' AND `architectures`.`name`=from_base64("%s")' \ + "$(printf '%s' "${arch}" | base64 -w0)" printf ' AND `package_sources`.`%s`=from_base64("%s")' \ 'pkgbase' "$(printf '%s' "${pkgbase}" | base64 -w0)" \ 'git_revision' "$(printf '%s' "${git_revision}" | base64 -w0)" \ |