Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-06-07 11:03:05 +0200
committerErich Eckner <git@eckner.net>2017-06-07 11:03:05 +0200
commit5fe5fa90fab4c60b1529ec03a9c482050981625f (patch)
treed781a6a3f8f71d790cf44e2a894588151c749450 /bin
parent278369c53402d606b2953abc2df12049ff3303fa (diff)
bin/return-assignment: put all packages into _one_ staging directory and rename statefile instead of removing it
Diffstat (limited to 'bin')
-rwxr-xr-xbin/return-assignment12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index aca4062..71a89b6 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -128,13 +128,13 @@ if [ -n "${package_errors}" ]; then
fi
# move packages
-mkdir -p "${master_mirror_directory}/i686/$4-staging/"
-mv *.pkg.tar.xz{,.sig} "${master_mirror_directory}/i686/$4-staging/"
+mkdir -p "${master_mirror_directory}/i686/staging/"
+mv *.pkg.tar.xz{,.sig} "${master_mirror_directory}/i686/staging/"
(
- cd "${master_mirror_directory}/i686/$4-staging"
- repo-add "$4-staging.db.tar.gz" "${packages[@]}"
- # repo-add -v -s -k "${repo_key}" "$4-staging.db.tar.gz" "${packages[@]}"
+ cd "${master_mirror_directory}/i686/staging"
+ repo-add 'staging.db.tar.gz' "${packages[@]}"
+ # repo-add -v -s -k "${repo_key}" 'staging.db.tar.gz' "${packages[@]}"
# remove old versions of same packages
for package in "${packages[@]}"; do
@@ -156,4 +156,4 @@ grep "^${1//./\\.}\$" "${work_dir}/build-list.loops/loop_"* 2> /dev/null | \
sed -i "/^${1//./\\.} $2 $3 $4\$/d" "${work_dir}/build-list"
# remove package lock file
-rm "${work_dir}/package-states/$1.$2.$3.$4.locked"
+mv "${work_dir}/package-states/$1.$2.$3.$4."{locked,done}