Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/bootstrap-mysql5
-rwxr-xr-xbin/mysql-functions8
2 files changed, 8 insertions, 5 deletions
diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 116b6c7..5acc2e2 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -61,6 +61,7 @@ if [ ! "$1" = 'slim' ]; then
' sub_pkgrel MEDIUMINT' \
' has_issues BIT' \
' is_tested BIT' \
+ ' is_to_be_deleted BIT' \
' pkgname VARCHAR(64)' \
' architecture SMALLINT :architectures' \
' UNIQUE content build_assignment sub_pkgrel pkgname architecture repository' \
@@ -562,7 +563,7 @@ if [ -s "${tmp_dir}/new-stable-packages" ]; then
s/,$/;/
' "${tmp_dir}/new-stable-packages"
# shellcheck disable=SC2016
- printf 'INSERT IGNORE INTO `binary_packages` (`pkgname`,`epoch`,`pkgver`,`pkgrel`,`sub_pkgrel`,`architecture`,`repository`,`build_assignment`,`has_issues`,`is_tested`)'
+ printf 'INSERT IGNORE INTO `binary_packages` (`pkgname`,`epoch`,`pkgver`,`pkgrel`,`sub_pkgrel`,`architecture`,`repository`,`build_assignment`,`has_issues`,`is_tested`,`is_to_be_deleted`)'
printf ' SELECT '
# shellcheck disable=SC2016
printf '`stable_packages`.`%s`,' \
@@ -576,7 +577,7 @@ if [ -s "${tmp_dir}/new-stable-packages" ]; then
'architectures' \
'repositories'
# shellcheck disable=SC2016
- printf -- '-`build_assignment`,0,1 FROM `stable_packages`'
+ printf -- '-`build_assignment`,0,1,0 FROM `stable_packages`'
# shellcheck disable=SC2016
printf ' JOIN `%s` ON `stable_packages`.`%s`=`%s`.`name`' \
'repositories' 'repository' 'repositories' \
diff --git a/bin/mysql-functions b/bin/mysql-functions
index 6fb105f..c576260 100755
--- a/bin/mysql-functions
+++ b/bin/mysql-functions
@@ -90,10 +90,11 @@ mysql_add_binary_package() {
{
printf 'INSERT IGNORE INTO binary_packages'
printf ' ('
- printf '`%s`, ' 'sub_pkgrel' 'pkgname' 'package_source' 'repository' 'architecture'
+ printf '`%s`, ' 'sub_pkgrel' 'pkgname' 'package_source' 'repository' 'architecture' 'has_issues' 'is_tested' 'is_to_be_deleted'
printf ') SELECT'
printf ' from_base64("%s"), ' "${sub_pkgrel}" "${pkgname}"
printf ' `%s`.`id`,' 'package_sources' 'repositories' 'architectures'
+ printf ' 0, 0, 0'
printf ' FROM'
printf ' `%s` JOIN' 'package_sources' 'repositories' 'architectures'
printf ' `upstream_repositories` ON `package_sources`.`upstream_package_repository` = `upstream_repositories`.`id`'
@@ -470,7 +471,8 @@ mysql_generate_package_metadata() {
'pkgname' \
'sub_pkgrel' \
'has_issues' \
- 'is_tested'
+ 'is_tested' \
+ 'is_to_be_deleted'
printf ') SELECT '
printf '`%s`.`id`,' \
'build_assignments' \
@@ -481,7 +483,7 @@ mysql_generate_package_metadata() {
"${pkgver}" \
"${pkgrel}" \
"${pkgname}"
- printf '%s,0,0 FROM' \
+ printf '%s,0,0,0 FROM' \
"${sub_pkgrel}"
printf ' `%s` JOIN' \
'repositories' \