mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-15 10:56:19 +02:00
Compare commits
1 Commits
939790367a
...
272-check-
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8125a81a98 |
@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
|
||||
makechrootpkg_args+=("${@:$OPTIND}")
|
||||
|
||||
# Automatically recreate the root chroot if a version mismatch is detected
|
||||
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
|
||||
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
|
||||
if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
|
||||
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
|
||||
clean_first=true
|
||||
|
@@ -8,8 +8,6 @@ DEVTOOLS_INCLUDE_DB_MOVE_SH=1
|
||||
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
|
||||
# shellcheck source=src/lib/common.sh
|
||||
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
|
||||
# shellcheck source=src/lib/valid-repos.sh
|
||||
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
|
||||
|
||||
set -e
|
||||
|
||||
@@ -22,7 +20,6 @@ pkgctl_db_move_usage() {
|
||||
Move packages between binary repositories.
|
||||
|
||||
OPTIONS
|
||||
--noconfirm Bypass any confirmation messages, should only be used with caution
|
||||
-h, --help Show this help text
|
||||
|
||||
EXAMPLES
|
||||
@@ -32,12 +29,9 @@ _EOF_
|
||||
}
|
||||
|
||||
pkgctl_db_move() {
|
||||
if (( $# < 3 )); then
|
||||
pkgctl_db_move_usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local CONFIRM=1
|
||||
local SOURCE_REPO=""
|
||||
local TARGET_REPO=""
|
||||
local PKGBASES=()
|
||||
|
||||
# option checking
|
||||
while (( $# )); do
|
||||
@@ -46,10 +40,6 @@ pkgctl_db_move() {
|
||||
pkgctl_db_move_usage
|
||||
exit 0
|
||||
;;
|
||||
--noconfirm)
|
||||
CONFIRM=0
|
||||
shift
|
||||
;;
|
||||
-*)
|
||||
die "invalid argument: %s" "$1"
|
||||
;;
|
||||
@@ -59,35 +49,16 @@ pkgctl_db_move() {
|
||||
esac
|
||||
done
|
||||
|
||||
local source_repo=$1
|
||||
local target_repo=$2
|
||||
if (( $# < 3 )); then
|
||||
pkgctl_db_move_usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SOURCE_REPO=$1
|
||||
TARGET_REPO=$2
|
||||
shift 2
|
||||
PKGBASES+=("$@")
|
||||
|
||||
if ! in_array "${source_repo}" "${DEVTOOLS_VALID_REPOS[@]}"; then
|
||||
die "Invalid source repository: %s" "${source_repo}"
|
||||
fi
|
||||
if ! in_array "${target_repo}" "${DEVTOOLS_VALID_REPOS[@]}"; then
|
||||
die "Invalid target repository: %s" "${target_repo}"
|
||||
fi
|
||||
|
||||
if (( CONFIRM )); then
|
||||
local pkglist
|
||||
pkglist=$(printf '%s\n' "$@" | paste -sd ' ')
|
||||
read -r -p "Move packages from [${source_repo}] to [${target_repo}]: ${pkglist}? [Y/n] " response
|
||||
case ${response} in
|
||||
[Yy][Ee][Ss]|[Yy]|'')
|
||||
: # continue
|
||||
;;
|
||||
*)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
local pkgbase
|
||||
for pkgbase in "$@"; do
|
||||
msg "Moving [%s] from [%s] to [%s]" "${pkgbase}" "${source_repo}" "${target_repo}"
|
||||
# shellcheck disable=SC2046
|
||||
db-move "${source_repo}" "${target_repo}" $(pacman -Sql "${source_repo}" | grep "^${pkgbase}" || echo "${pkgbase}")
|
||||
done
|
||||
# shellcheck disable=SC2029
|
||||
ssh "${PACKAGING_REPO_RELEASE_HOST}" db-move "${SOURCE_REPO}" "${TARGET_REPO}" "${PKGBASES[@]}"
|
||||
}
|
||||
|
Reference in New Issue
Block a user