mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-16 03:16:19 +02:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
65365f1853 | ||
![]() |
06a681ca3d | ||
![]() |
b763788b16 | ||
![]() |
c2d9a0e7b1 |
@@ -55,7 +55,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
|
|||||||
rm -rf "${chroots}/${repo}-${arch}"
|
rm -rf "${chroots}/${repo}-${arch}"
|
||||||
mkdir -p "${chroots}/${repo}-${arch}"
|
mkdir -p "${chroots}/${repo}-${arch}"
|
||||||
setarch "${arch}" mkarchroot \
|
setarch "${arch}" mkarchroot \
|
||||||
-C "${pacman_conf}" \
|
-C "@pkgdatadir@/pacman-${repo}.conf" \
|
||||||
-M "@pkgdatadir@/makepkg-${arch}.conf" \
|
-M "@pkgdatadir@/makepkg-${arch}.conf" \
|
||||||
"${chroots}/${repo}-${arch}/root" \
|
"${chroots}/${repo}-${arch}/root" \
|
||||||
"${base_packages[@]}"
|
"${base_packages[@]}"
|
||||||
|
12
commitpkg.in
12
commitpkg.in
@@ -135,7 +135,7 @@ for _arch in ${arch[@]}; do
|
|||||||
fullver=$(get_full_version $_pkgname)
|
fullver=$(get_full_version $_pkgname)
|
||||||
|
|
||||||
if ! pkgfile=$(shopt -s nullglob;
|
if ! pkgfile=$(shopt -s nullglob;
|
||||||
getpkgfile "${DESTDIR+$DESTDIR/}$_pkgname-$fullver-${_arch}".pkg.tar.?z); then
|
getpkgfile "${PKGDEST+$PKGDEST/}$_pkgname-$fullver-${_arch}".pkg.tar.?z); then
|
||||||
warning "Skipping $_pkgname-$fullver-$_arch: failed to locate package file"
|
warning "Skipping $_pkgname-$fullver-$_arch: failed to locate package file"
|
||||||
skip_arches+=($_arch)
|
skip_arches+=($_arch)
|
||||||
continue 2
|
continue 2
|
||||||
@@ -168,6 +168,16 @@ for _arch in ${arch[@]}; do
|
|||||||
done
|
done
|
||||||
archrelease "${commit_arches[@]/#/$repo-}" || die
|
archrelease "${commit_arches[@]/#/$repo-}" || die
|
||||||
|
|
||||||
|
new_uploads=()
|
||||||
|
|
||||||
|
# convert to absolute paths so rsync can work with colons (epoch)
|
||||||
|
while read -r -d '' upload; do
|
||||||
|
new_uploads+=("$upload")
|
||||||
|
done < <(realpath -z "${uploads[@]}")
|
||||||
|
|
||||||
|
uploads=("${new_uploads[@]}")
|
||||||
|
unset new_uploads
|
||||||
|
|
||||||
if [[ ${#uploads[*]} -gt 0 ]]; then
|
if [[ ${#uploads[*]} -gt 0 ]]; then
|
||||||
msg 'Uploading all package and signature files'
|
msg 'Uploading all package and signature files'
|
||||||
rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
|
rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
|
||||||
|
Reference in New Issue
Block a user