summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-04-16 11:54:15 +0200
committerErich Eckner <git@eckner.net>2018-04-16 11:54:15 +0200
commitb46fb496ee7425fdee5e1b743e772184e27e71f7 (patch)
tree1423796cedfc62a79563bd536f1527b4eb597893 /bin
parent5c53cf8fb86a1ced8892a6df07f777c83e4f1ba1 (diff)
downloadbuilder-b46fb496ee7425fdee5e1b743e772184e27e71f7.tar.xz
remove `files` and `file_providers` - they're not practicable in the database
Diffstat (limited to 'bin')
-rwxr-xr-xbin/bootstrap-mysql12
-rwxr-xr-xbin/return-assignment22
2 files changed, 1 insertions, 33 deletions
diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index ca84bcf..822d995 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -165,17 +165,7 @@ if [ ! "$1" = 'slim' ]; then
' locked_tasks_count MEDIUMINT' \
' blocked_tasks_count MEDIUMINT' \
' next_tasks_count MEDIUMINT' \
- ' UNIQUE date' \
- 'files BIGINT' \
- ' path TEXT' \
- ' name TEXT' \
- ' name_hash VARCHAR(128)' \
- ' absolute_name_hash VARCHAR(128)' \
- 'file_providers BIGINT' \
- ' package BIGINT :binary_packages' \
- ' file BIGINT :files'
- # TODO: files and file_providers is currently not represented
- # correctly, because they are not representable in this form
+ ' UNIQUE date'
)
# shellcheck disable=SC2016
diff --git a/bin/return-assignment b/bin/return-assignment
index 630349c..3c6e3d1 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -426,25 +426,6 @@ find . -maxdepth 1 -name '*.pkg.tar.xz' \
' > \
"${tmp_dir}/sha512sums"
-# generate file lists
-find . -maxdepth 1 -name '*.pkg.tar.xz' \
- -printf '%f %p\n' | \
- while read -r pkgfile path; do \
- pacman -Qqlp "${path}" | \
- sed '
- s/^/'"${pkgfile}"'\t/
- '
- done | \
- sed -n '
- s/-\(\([^-:]\+\):\)\?\([^-:]\+\)-\([^-.]\+\)\(\.\([^-.]\+\)\)\?-\([^-]\+\)\.pkg\.tar\.xz\t/\t\2\t\3\t\4\t\6\t\7\t/
- T
- s/\t\t/\t0\t/g
- s,/$,,
- s,/\([^\t/]\+\)$,/\t\1,
- p
- ' > \
- "${tmp_dir}/files"
-
# move namcap.logs
find . -maxdepth 1 -name '*.pkg.tar.xz-namcap.log.gz' -execdir mv '{}' "${build_log_directory}/success/" \;
@@ -470,9 +451,6 @@ trigger_mirror_refreshs
# shellcheck disable=SC2016
{
- # insert file lists into database
-# mysql_insert_package_files_query "${tmp_dir}/files"
-
# insert checksums into database
printf 'CREATE TEMPORARY TABLE `pkg_hashes` (`sha512sum` VARCHAR(128), `pkgfile` VARCHAR(128));\n'
printf 'LOAD DATA LOCAL INFILE "%s" INTO TABLE `pkg_hashes`;\n' \