summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-02-20 15:00:12 +0100
committerErich Eckner <git@eckner.net>2020-02-20 15:00:12 +0100
commite6a20e404220f11b5dcb89a26487e1bbca79230a (patch)
tree8deb8b38e68a76e28da7d122e2cdf16db940aa97
parentc3fe3412a9257822aab29a0196f4281e9b75bf45 (diff)
downloadbuilder-e6a20e404220f11b5dcb89a26487e1bbca79230a.tar.xz
lib/mysql-functions: mysql_query_delete_packages(): make regex less restrictive, fix some column names
-rwxr-xr-xlib/mysql-functions8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 706a11d..abd7488 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -1787,9 +1787,9 @@ mysql_query_delete_packages() {
mysql_join_binary_packages_in_repositories_repositories 'keep_bpir' 'keep_r'
printf ' AND %s' "${repositories_condition}" \
| sed '
- s/\b`repositories`\b/`keep_r`/g
+ s/`repositories`/`keep_r`/g
'
- printf ') ON `keep_bpir`.`binary_package`=`binary_packages`.`id`'
+ printf ') ON `keep_bpir`.`package`=`binary_packages`.`id`'
;;
'3')
printf ' LEFT JOIN ('
@@ -1798,7 +1798,7 @@ mysql_query_delete_packages() {
mysql_join_binary_packages_in_repositories_repositories 'keep_bpir' 'keep_r'
printf ' AND NOT (%s)' "${repositories_condition}" \
| sed '
- s/\b`repositories`\b/`keep_r`/g
+ s/`repositories`/`keep_r`/g
'
printf ') ON `keep_bp`.`build_assignment`=`build_assignments`.`id`'
;;
@@ -1810,7 +1810,7 @@ mysql_query_delete_packages() {
mysql_join_binary_packages_in_repositories_repositories 'keep_bpir' 'keep_r'
printf ' AND %s' "${repositories_condition}" \
| sed '
- s/\b`repositories`\b/`keep_r`/g
+ s/`repositories`/`keep_r`/g
'
printf ') ON `keep_ba`.`package_source`=`package_sources`.`id`'
;;