Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-05-04 14:13:32 +0200
committerErich Eckner <git@eckner.net>2018-05-04 14:13:32 +0200
commitb4601c1e413e1d1f8db002fa4e126f4e9290555b (patch)
treed3f1b024e737f5d24c25c01804b3ad20887864f9 /lib
parent7681f74b23f146dea8d07bb792966ba279a252e0 (diff)
lib/mysql-functions: remove some debug output
Diffstat (limited to 'lib')
-rwxr-xr-xlib/mysql-functions16
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 8947dbc..10808ab 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -126,10 +126,8 @@ mysql_add_package_source() {
else
uses_modification=0
fi
- printf 'A' >&2
if grep -qx 'PKGBUILD = \S\+' "${srcinfo_file}"; then
uses_upstream=1
- printf 'B' >&2
eval 'repo_path="${repo_paths__'"$(sed -n 's/^upstream_git_repository = //;T;p' "${srcinfo_file}")"'}"'
pkgbuild=$(
sed -n '
@@ -138,26 +136,19 @@ mysql_add_package_source() {
p
' "${srcinfo_file}"
)
- printf 'C' >&2
commit_time=$(
git -C "${repo_path}" log -n 1 --pretty=format:%ct "${old_git_revision}${git_revision}" -- "${pkgbuild}"
)
- printf 'D' >&2
if [ -z "${commit_time}" ]; then
# We may have modified git_mod_revision!
- printf 'E' >&2
commit_time=$(
git -C "${repo_path}" log -n 1 --pretty=format:%ct "${git_revision}" -- "${pkgbuild}"
)
- printf 'F' >&2
fi
else
- printf 'G' >&2
uses_upstream=0
commit_time=$(date '+%s')
- printf 'H' >&2
fi
- printf 'I' >&2
upstream_package_repository_id=$(
{
@@ -206,7 +197,6 @@ mysql_add_package_source() {
printf 'SELECT LAST_INSERT_ID();\n'
} | \
mysql_run_query
- printf 'J' >&2
}
# mysql_generate_package_metadata $current_repository $package $git_revision $old_git_revision $mod_git_revision $repository
@@ -243,7 +233,6 @@ mysql_generate_package_metadata() {
temp_dir=$(mktemp -d 'tmp.mysql-functions.mysql_generate_package_metadata.XXXXXXXXXX' --tmpdir)
trap 'rm -rf --one-file-system "${temp_dir}"' EXIT
- printf '.a' >&2
if ! make_source_info "${package}" "${repository}" "${git_revision}" "${mod_git_revision}" "${temp_dir}/SRCINFO"; then
printf '"make_source_info %s %s %s %s %s" failed.\n' "${package}" "${repository}" "${git_revision}" "${mod_git_revision}" "${temp_dir}/SRCINFO"
exit 2
@@ -263,7 +252,6 @@ mysql_generate_package_metadata() {
fi
printf '\n\n' >> "${temp_dir}/SRCINFO"
- printf '.b' >&2
pkgbase=$(
grep '^pkgbase = ' "${temp_dir}/SRCINFO" | \
cut -d' ' -f3
@@ -272,13 +260,11 @@ mysql_generate_package_metadata() {
>&2 printf '"make_source_info" did not return a "pkgbase" - eh, what?\n'
exit 2
fi
- printf '.c' >&2
# add the package source
package_source_id=$(
mysql_add_package_source "${pkgbase}" "${git_revision}" "${old_git_revision}" "${mod_git_revision}" "${repository}" "${temp_dir}/SRCINFO"
)
- printf '.d' >&2
# now we encode everything in base64
current_repository=$(
@@ -642,7 +628,6 @@ mysql_generate_package_metadata() {
} >> \
"${temp_dir}/add-install-targets-command"
done
- printf '.e' >&2
{
if [ -s "${temp_dir}/add-build-assignments-command" ]; then
@@ -656,7 +641,6 @@ mysql_generate_package_metadata() {
fi
} | \
mysql_run_query
- printf '.f' >&2
)
}