Mark Hymers pushed to branch deploy at Debian FTP Team / dak
Commits:
1 changed file:
Changes:
... | ... | @@ -393,16 +393,29 @@ merge-release-signatures() { |
393 | 393 |
|
394 | 394 |
echo "==== Processing ${s}/${oursignature}..."
|
395 | 395 |
|
396 |
+ mkdir -p ~/${suitename}_${newrev}/${s}
|
|
397 |
+ |
|
396 | 398 |
# backup ${oursignature} before we modify it...
|
397 |
- cp --no-clobber ${archiveroot}/zzz-dists/${s}/${oursignature} ~/${suitename}_${newrev}/${oursignature}
|
|
399 |
+ # make a .orig copy which we don't overwrite below
|
|
400 |
+ cp --no-clobber ${archiveroot}/zzz-dists/${s}/${oursignature} ~/${suitename}_${newrev}/${s}/${oursignature}
|
|
401 |
+ cp --no-clobber ${archiveroot}/zzz-dists/${s}/${oursignature} ~/${suitename}_${newrev}/${s}/${oursignature}.orig
|
|
398 | 402 |
|
399 |
- cd ~/${suitename}_${newrev}
|
|
403 |
+ cd ~/${suitename}_${newrev}/${s}
|
|
400 | 404 |
while ! ${wget} -O "${releasefile}" "${release_base}/${releasefile}"; do
|
401 | 405 |
sleep 10
|
402 | 406 |
done
|
403 |
- ${scriptsdir}/gpg-merge-signatures "${oursignature}" "${releasefile}" > ${archiveroot}/dists/${s}/${oursignature}
|
|
407 |
+ |
|
408 |
+ ${scriptsdir}/gpg-merge-signatures "${oursignature}" "${releasefile}" > ${oursignature}.combined
|
|
409 |
+ mv ${oursignature}.combined ${oursignature}
|
|
410 |
+ |
|
411 |
+ # If detached, copy the text for checking
|
|
412 |
+ if [ ! -z ${ourmessage} ]; then
|
|
413 |
+ cp ${archiveroot}/dists/${s}/${ourmessage} ${ourmessage}
|
|
414 |
+ fi
|
|
404 | 415 |
|
405 | 416 |
gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify ${oursignature} ${ourmessage}
|
417 |
+ |
|
418 |
+ cp ${oursignature} ${archiveroot}/dists/${s}/${oursignature}
|
|
406 | 419 |
}
|
407 | 420 |
|
408 | 421 |
merge-release-signatures $(get_archiveroot ftp-master) ${suite} Release.gpg Release Release-${newrev}.gpg
|