From 3bd980fbe58eb8e2b6cf74102069f00e284ce712 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 19 Dec 2019 10:47:45 +0100 Subject: bin/nit-picker: build_assignment,epoch,pkgver,pkgrel and sub_pkgrel must match to identify parts of a split package --- bin/nit-picker | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/bin/nit-picker b/bin/nit-picker index e073439..16ac5c6 100755 --- a/bin/nit-picker +++ b/bin/nit-picker @@ -171,7 +171,13 @@ while pgrep -x ii >/dev/null \ printf 'SELECT DISTINCT' printf ' "package-blob",' - printf '`binary_packages`.`build_assignment`,' + printf 'CONCAT(' + printf '`binary_packages`.`build_assignment`,"-",' + printf '`binary_packages`.`epoch`,":",' + printf '`binary_packages`.`pkgver`,"-",' + printf '`binary_packages`.`pkgrel`,".",' + printf '`binary_packages`.`sub_pkgrel`' + printf '),' printf '`repositories`.`architecture`' printf ' FROM `binary_packages`' mysql_join_binary_packages_binary_packages_in_repositories @@ -527,8 +533,17 @@ while pgrep -x ii >/dev/null \ printf '`repository_stabilities`.`name`' printf ' FROM `binary_packages`' mysql_join_binary_packages_build_assignments - printf ' AND `build_assignments`.`id`=%s' \ - "${parameters% *}" + printf 'AND CONCAT(' + printf '`binary_packages`.`build_assignment`,"-",' + printf '`binary_packages`.`epoch`,":",' + printf '`binary_packages`.`pkgver`,"-",' + printf '`binary_packages`.`pkgrel`,".",' + printf '`binary_packages`.`sub_pkgrel`' + printf ')=from_base64("%s"),' \ + "$( + printf '%s' "${parameters% *}" \ + | base64 -w0 + )" mysql_join_build_assignments_package_sources mysql_join_binary_packages_binary_packages_in_repositories mysql_join_binary_packages_in_repositories_repositories -- cgit v1.2.3