summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-14 09:53:30 +0200
committerErich Eckner <git@eckner.net>2018-09-14 09:53:30 +0200
commit552d757ba262b3fd67aef60c9e121f4a53fa64b2 (patch)
tree5db9ae69b32f2e981c57c92bb1e3ab6a80630dae
parentd4e92e298ab3f3dc9653217e16f6a6231d7f9195 (diff)
downloadbuilder-552d757ba262b3fd67aef60c9e121f4a53fa64b2.tar.xz
bin/return-assignment: save architecture in log-file name
-rwxr-xr-xbin/return-assignment6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index 6b4c40b..aacf928 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -120,7 +120,7 @@ if [ "$6" = 'ERROR' ]; then
-C "${build_log_directory}/error" \
--wildcards \
--no-wildcards-match-slash \
- --transform="s|^|$1.$2.$3.$4.|" \
+ --transform="s|^|$1.$2.$3.$4.$5.|" \
'*.build-log.gz'
)
@@ -148,7 +148,7 @@ if [ "$6" = 'ERROR' ]; then
printf '%s' "${identifier}" | \
base64 -d
)\$" \
- "${build_log_directory}/error/$1.$2.$3.$4.${saved_build_log}"; then
+ "${build_log_directory}/error/$1.$2.$3.$4.$5.${saved_build_log}"; then
printf ' (from_base64("%s"),%s,from_base64("%s")),' \
"$(
@@ -210,7 +210,7 @@ if [ "$6" = 'ERROR' ]; then
haskell_rebuild_packages=$(
find "${build_log_directory}/error" -type f \
- -name "$1.$2.$3.$4.*.build-log.gz" \
+ -name "$1.$2.$3.$4.$5.*.build-log.gz" \
-exec zgrep -qFx ' The following packages are broken because other packages they depend on are missing. These broken packages must be rebuilt before they can be used.' {} \; \
-exec zcat {} \; | \
sed -n '