summaryrefslogtreecommitdiff
path: root/lib/common-functions
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-10-17 10:19:56 +0200
committerErich Eckner <git@eckner.net>2019-10-17 10:19:56 +0200
commit95aa99618adf4f55d1a61f8e9fab56c7960a84e4 (patch)
treef321bdfa38dbd02a64018d58c5c6a1ba856452c0 /lib/common-functions
parent9ec94e507ffde2b21b95b1107d6812f83bebc104 (diff)
downloadbuilder-95aa99618adf4f55d1a61f8e9fab56c7960a84e4.tar.xz
lib/mysql-functions: mysql_package_name_query(): take compression suffix from database, default to "tar.xz" for now
Diffstat (limited to 'lib/common-functions')
-rwxr-xr-xlib/common-functions4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common-functions b/lib/common-functions
index 30b80a2..729cc46 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -163,7 +163,7 @@ remove_old_package_versions() {
printf '`d_bp`.`pkgname`,'
printf 'CONCAT(`d_ra`.`name`,"/",'
printf '`d_r`.`name`,"/",'
- mysql_package_name_query 'd_bp' 'd_bpa'
+ mysql_package_name_query 'd_bp' 'd_bpa' 'd_bpc'
printf ')'
printf ' FROM `binary_packages_in_repositories` AS `d_bpir`'
mysql_join_binary_packages_in_repositories_binary_packages 'd_bpir' 'd_bp'
@@ -171,6 +171,8 @@ remove_old_package_versions() {
printf ' AND `d_r`.`is_on_master_mirror`'
mysql_join_repositories_architectures 'd_r' 'd_ra'
mysql_join_binary_packages_architectures 'd_bp' 'd_bpa'
+ printf ' LEFT'
+ mysql_join_binary_packages_compressions 'd_bp' 'd_bpc'
printf ' JOIN `binary_packages` AS `o_bp`'
printf ' ON `d_bp`.`pkgname`=`o_bp`.`pkgname`'
mysql_join_binary_packages_binary_packages_in_repositories 'o_bp' 'o_bpir'