summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-11-01 09:05:40 +0100
committerErich Eckner <git@eckner.net>2017-11-01 09:05:40 +0100
commit4faad3f74c7930494fb4251173fad69274a8a96f (patch)
treea5095be23571fa1fdb4492494c6ede52cced7fe6
parentb63e03b9ada79029f2848195241e90557b6e2b2d (diff)
downloadbuilder-4faad3f74c7930494fb4251173fad69274a8a96f.tar.xz
bin/get-package-updates: break_loops is obsolete - removed
-rwxr-xr-xbin/common-functions35
-rwxr-xr-xbin/get-package-updates4
2 files changed, 0 insertions, 39 deletions
diff --git a/bin/common-functions b/bin/common-functions
index 7a76a5b..1f8da75 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -671,41 +671,6 @@ recursively_umount_and_rm() {
rm -rf --one-file-system "${dir}"
}
-# insert_break_loops_orders $file
-# inserts the correct number of 'break_loops' order into $file
-
-insert_break_loops_orders() {
- local file="$1"
- local looped_packages
- local line
-
- looped_packages=$(
- find "${work_dir}/build-list.loops" -maxdepth 1 | \
- grep '/loop_[0-9]\+$' | \
- xargs -r cat | \
- sort -u | \
- wc -l
- )
-
- (
- while read -r line; do
- if [ "${line}" = 'break_loops' ]; then
- if [ "${looped_packages}" -eq 0 ]; then
- continue
- fi
- looped_packages=$((looped_packages-1))
- fi
- printf '%s\n' "${line}"
- done < \
- "${file}"
- while [ ${looped_packages} -gt 0 ]; do
- looped_packages=$((looped_packages-1))
- echo 'break_loops'
- done
- ) | \
- sponge "${file}"
-}
-
# append_architectures $PKGBUILD
# mangle $arch in PKBUILDs to contain i486, i586, i686
diff --git a/bin/get-package-updates b/bin/get-package-updates
index a90f2ce..155e4d9 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -478,10 +478,6 @@ if [ -s "${work_dir}/tsort.error" ]; then
"${work_dir}/build-list.loops.new/${loop}.new" \
"${work_dir}/build-list.loops.new/${loop}"
done
-
- # add orders to break loops to build list
- insert_break_loops_orders "${work_dir}/build-list.new.new"
-
else
rm "${work_dir}/tsort.error"
fi