summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-08-30 21:13:34 +0200
committerErich Eckner <git@eckner.net>2017-08-30 21:13:34 +0200
commitb4165da762a8cb41692a8ab8b3aa78ddc8fcf343 (patch)
treeee7f5b03fbf7c812a4a35b65774a081f06805680
parentab5f85641b5be521a126770bb356a3b78f425b59 (diff)
downloadbuilder-b4165da762a8cb41692a8ab8b3aa78ddc8fcf343.tar.xz
bin/common-functions: remove_old_package_versions: split off architecture from repository
-rwxr-xr-xbin/common-functions9
-rwxr-xr-xbin/db-update2
-rwxr-xr-xbin/return-assignment2
3 files changed, 7 insertions, 6 deletions
diff --git a/bin/common-functions b/bin/common-functions
index 377efe5..e6acc53 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -392,13 +392,14 @@ ls_master_mirror() {
}
-# remove_old_package_versions $directory $package_file
-# removes all other versions of $package_file in $directory on the master mirror
+# remove_old_package_versions $arch $repository $package_file
+# removes all older versions of $package_file for architecture $arch in all
+# repositories not-older than $repository
remove_old_package_versions() {
- local directory="$1"
- local package="$2"
+ local directory="$1/$2"
+ local package="$3"
local pkgname="${package%-*-*-*.pkg.tar.xz}"
diff --git a/bin/db-update b/bin/db-update
index 354c5d8..6cc9cd2 100755
--- a/bin/db-update
+++ b/bin/db-update
@@ -288,7 +288,7 @@ move_packages() {
# then we can safely remove old versions
while read -r part; do
- ${dummynator} remove_old_package_versions "i686/$(cat "${tmp_dir}/${package}.to_repo")" "${part}"
+ ${dummynator} remove_old_package_versions 'i686' "$(cat "${tmp_dir}/${package}.to_repo")" "${part}"
done < \
"${tmp_dir}/${package}.parts"
diff --git a/bin/return-assignment b/bin/return-assignment
index 11dee67..05a8569 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -197,7 +197,7 @@ ${master_mirror_rsync_command} \
"${master_mirror_rsync_directory}/i686/${destination}/"
for package in ${packages}; do
- remove_old_package_versions "i686/${destination}" "${package}"
+ remove_old_package_versions 'i686' "${destination}" "${package}"
done
# remove old state files (these should be only "done" markers, but