summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-05-04 10:28:18 +0200
committerErich Eckner <git@eckner.net>2018-05-04 10:28:18 +0200
commit0b8656d1089ff62c3e1582fe9c4db92b5e7ef7cf (patch)
tree435efd4cc044108b365c6105075361fb4c6fa9f7 /lib
parentd3b57f2ec2fdf952bee8470c2de22e954e9cae12 (diff)
downloadbuilder-0b8656d1089ff62c3e1582fe9c4db92b5e7ef7cf.tar.xz
remove obsolete functions
Diffstat (limited to 'lib')
-rwxr-xr-xlib/common-functions43
-rwxr-xr-xlib/mysql-functions90
2 files changed, 0 insertions, 133 deletions
diff --git a/lib/common-functions b/lib/common-functions
index b524ab6..2cf4e22 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -574,49 +574,6 @@ mangle_pkgbuild() {
' "${PKGBUILD}"
}
-# find_newest_of_git_revisions
-# find newest git revision of the ones provided at stdin
-# (assuming linear history)
-
-find_newest_of_git_revisions() {
- local revisions
- local repo
- revisions=$(cat)
-
- if [ "$(
- echo "${revisions}" | \
- wc -l
- )" -eq 1 ]; then
-
- echo "${revisions}"
- return
-
- fi
-
- repo=$(
- find_repository_with_commit \
- "$(
- echo "${revisions}" | \
- grep -xm1 '[0-9a-f]\{40\}'
- )"
- )
-
- eval 'repo="${repo_paths__'"${repo}"'}"'
-
- echo "${revisions}" | \
- xargs -rn1 git -C "${repo}" rev-parse | \
- {
- newest=''
- while read -r current; do
- if [ -z "${newest}" ] || \
- git -C "${repo}" merge-base --is-ancestor "${newest}" "${current}"; then
- newest="${current}"
- fi
- done
- echo "${newest}"
- }
-}
-
# find_package_repository_to_package $package $git_repository $git_commit
# find the package repository a package from a given git repository
# belongs to
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 40c91be..b9e1f1f 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -204,55 +204,6 @@ mysql_add_package_source() {
printf 'J' >&2
}
-# mysql_show_binary_package $pkgname $pkgver $pkgrel $sub_pkgrel
-
-# shellcheck disable=SC2031,SC2086,SC2154
-mysql_show_binary_package() {
- local names='pkgname pkgver pkgrel sub_pkgrel'
- local name
- for name in ${names}; do
- eval 'local '"${name}"
- eval "${name}"'=$(
- printf "%s" "$1" |
- base64 -w0
- )'
- shift
- done
-
- {
- printf 'SELECT'
- printf ' `%s`.`%s`,' \
- 'repositories' 'name' \
- 'binary_packages' 'pkgname' \
- 'package_sources' 'pkgver' \
- 'package_sources' 'pkgrel' \
- 'binary_packages' 'sub_pkgrel' \
- 'architectures' 'name' \
- 'package_sources' 'pkgbase' \
- 'package_sources' 'git_revision' \
- 'package_sources' 'mod_git_revision' \
- 'upstream_repositories' 'name'
- printf ' FROM `binary_packages`'
- mysql_join_binary_packages_architectures
- mysql_join_binary_packages_repositories
- mysql_join_binary_packages_build_assignments
- mysql_join_build_assignments_package_sources
- mysql_join_package_sources_upstream_repositories
- printf ' WHERE'
- printf ' `%s`.`%s` = from_base64("%s") AND' \
- 'binary_packages' 'pkgname' "${pkgname}" \
- 'binary_packages' 'sub_pkgrel' "${sub_pkgrel}" \
- 'package_sources' 'pkgver' "${pkgver}" \
- 'package_sources' 'pkgrel' "${pkgrel}"
- printf ';'
- } | \
- sed '
- s|, FROM| FROM|g
- s|AND;|;|g
- ' | \
- mysql_run_query --html --column-names
-}
-
# mysql_generate_package_metadata $current_repository $package $git_revision $old_git_revision $mod_git_revision $repository
# if sub_pkgrel should be determined automatically
# and
@@ -1071,47 +1022,6 @@ mysql_repair_binary_packages_without_build_assignment() {
mysql_run_query
}
-# mysql_remove_duplicate_binary_packages
-# remove duplicate binary_packages, matching pkgname, epoch, pkgver, pkgrel,
-# having difference of 1 in sub_pkgrel
-
-mysql_remove_duplicate_build_order() {
- {
- printf 'CREATE TEMPORARY TABLE `ren`'
- printf ' (`old` BIGINT, `new` BIGINT, `repo` BIGINT, `sub_pkgrel` BIGINT);\n'
- printf 'INSERT INTO `ren` (`old`,`new`,`repo`,`sub_pkgrel`)'
- printf ' SELECT `old`.`id`,`new`.`id`,`old`.`repository`,`old`.`sub_pkgrel`'
- printf ' FROM `binary_packages` as `old`'
- printf ' JOIN `binary_packages` as `new` ON'
- printf ' `old`.`%s`=`new`.`%s` AND' \
- 'pkgname' 'pkgname' \
- 'epoch' 'epoch' \
- 'pkgver' 'pkgver' \
- 'pkgrel' 'pkgrel'
- printf ' `old`.`sub_pkgrel`+1=`new`.`sub_pkgrel`'
- mysql_join_binary_packages_repositories 'old' 'orep'
- mysql_join_binary_packages_repositories 'new' 'nrep'
- printf ' WHERE `orep`.`name`!="to-be-decided"'
- printf ' AND `nrep`.`name`="to-be-decided";\n'
- printf 'UPDATE IGNORE `dependencies`'
- printf ' JOIN `ren` ON `ren`.`old`=`dependencies`.`dependent`'
- printf ' SET `dependencies`.`dependent`=`ren`.`new`;\n'
- printf 'UPDATE IGNORE `install_target_providers`'
- printf ' JOIN `ren` ON `ren`.`old`=`install_target_providers`.`package`'
- printf ' SET `install_target_providers`.`package`=`ren`.`new`;\n'
- printf 'DELETE FROM `binary_packages`'
- printf ' WHERE EXISTS ('
- printf 'SELECT * FROM `ren`'
- printf ' WHERE `ren`.`old`=`binary_packages`.`id`'
- printf ');\n'
- printf 'UPDATE IGNORE `binary_packages`'
- printf ' JOIN `ren` ON `ren`.`new`=`binary_packages`.`id`'
- printf ' SET `binary_packages`.`repository`=`ren`.`repo`,'
- printf ' `binary_packages`.`sub_pkgrel`=`ren`.`sub_pkgrel`;\n'
- } | \
- mysql_run_query
-}
-
# mysql_package_name_query
# print a mysql query of the full name of a package file