Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <erich.eckner.ext@bestsecret.com>2023-05-22 11:15:37 +0200
committerErich Eckner <erich.eckner.ext@bestsecret.com>2023-05-22 11:15:37 +0200
commitfd8427a467fa80915199ef1465ae07252bc704af (patch)
treef5785b6775f0bf97e4959f352d3c6f0b79fb76f9
parent63c30a7ba2b3177cc1b74b36c7a437d653d12497 (diff)
remove apply_trunk_patch - it makes no sense
-rwxr-xr-xlib/common-functions25
1 files changed, 0 insertions, 25 deletions
diff --git a/lib/common-functions b/lib/common-functions
index 3a7d635..0658f24 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -876,31 +876,6 @@ failsafe_rsync() {
return 1
}
-# apply_trunk_patch source_dir diff_source_dir
-# apply a patch between diff_source_dir/PKGBUILD and
-# diff_source_dir/../../trunk/PKGBUILD onto source_dir/PKGBUILD
-apply_trunk_patch() {
- local source_dir="$1"
- local diff_source_dir="$2"
- if [ -z "${diff_source_dir}" ]; then
- # no diff_source_dir => no action
- return
- fi
- chmod +w "${source_dir}/PKGBUILD"
- diff -u3 "${diff_source_dir}/PKGBUILD" "${diff_source_dir}/../../trunk/PKGBUILD" \
- | sed '
- 1,2 s#^\(\(+++\|---\)\s\+\)\S\+/\(PKGBUILD\s.*\)$#\1\3#
- ' \
- | patch -p0 "${source_dir}/PKGBUILD"
- chmod -w "${source_dir}/PKGBUILD"
- find "${diff_source_dir}/../../trunk/" \
- -mindepth 1 \
- -maxdepth 1 \
- -not -name 'PKGBUILD' \
- -type f \
- -exec cp '{}' "${source_dir}" \;
-}
-
# update_blocked_packages_count
# update the count how many packages are blocked by a build assignment
update_blocked_packages_count() {