mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-14 18:36:18 +02:00
Compare commits
1 Commits
31cca91b4e
...
272-check-
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8125a81a98 |
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
|
|||||||
db
|
db
|
||||||
diff
|
diff
|
||||||
issue
|
issue
|
||||||
license
|
|
||||||
release
|
release
|
||||||
repo
|
repo
|
||||||
search
|
search
|
||||||
|
@@ -78,10 +78,9 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
|
|||||||
|
|
||||||
# Pass all arguments after -- right to makepkg
|
# Pass all arguments after -- right to makepkg
|
||||||
makechrootpkg_args+=("${@:$OPTIND}")
|
makechrootpkg_args+=("${@:$OPTIND}")
|
||||||
cachedir=$(pacman-conf -c "${pacman_config}" CacheDir)
|
|
||||||
|
|
||||||
# Automatically recreate the root chroot if a version mismatch is detected
|
# 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
|
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"
|
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
|
||||||
clean_first=true
|
clean_first=true
|
||||||
@@ -106,7 +105,6 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
|
|||||||
setarch "${set_arch}" mkarchroot \
|
setarch "${set_arch}" mkarchroot \
|
||||||
-C "${pacman_config}" \
|
-C "${pacman_config}" \
|
||||||
-M "${makepkg_config}" \
|
-M "${makepkg_config}" \
|
||||||
-c "${cachedir}" \
|
|
||||||
"${chroots}/${repo}-${arch}/root" \
|
"${chroots}/${repo}-${arch}/root" \
|
||||||
"${base_packages[@]}" || abort
|
"${base_packages[@]}" || abort
|
||||||
else
|
else
|
||||||
|
@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
|
|||||||
if [[ ! -f "${file}" ]]; then
|
if [[ ! -f "${file}" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if ! git ls-files --error-unmatch "$file" >/dev/null; then
|
if ! git ls-files --error-unmatch "$file"; then
|
||||||
die "%s is not under version control" "$file"
|
die "%s is not under version control" "$file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@@ -191,9 +191,7 @@ path = [
|
|||||||
".nvchecker.toml",
|
".nvchecker.toml",
|
||||||
"*.install",
|
"*.install",
|
||||||
"*.sysusers",
|
"*.sysusers",
|
||||||
"*sysusers.conf",
|
|
||||||
"*.tmpfiles",
|
"*.tmpfiles",
|
||||||
"*tmpfiles.conf",
|
|
||||||
"*.logrotate",
|
"*.logrotate",
|
||||||
"*.pam",
|
"*.pam",
|
||||||
"*.service",
|
"*.service",
|
||||||
|
Reference in New Issue
Block a user