mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-10-12 23:36:18 +02:00
Compare commits
1 Commits
9fe010cf37
...
make-warni
Author | SHA1 | Date | |
---|---|---|---|
![]() |
287d2b4064 |
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
|
|||||||
db
|
db
|
||||||
diff
|
diff
|
||||||
issue
|
issue
|
||||||
license
|
|
||||||
release
|
release
|
||||||
repo
|
repo
|
||||||
search
|
search
|
||||||
|
@@ -123,10 +123,9 @@ fi
|
|||||||
needsversioning=()
|
needsversioning=()
|
||||||
|
|
||||||
if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
|
if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
|
||||||
# TODO: Make this a hard failure in the future after packagers have had
|
error "package doesn't have proper licensing information, set it up using:"
|
||||||
# some time to add licenses to all packages.
|
|
||||||
warning "package doesn't have proper licensing information, set it up using:"
|
|
||||||
msg2 'pkgctl license setup'
|
msg2 'pkgctl license setup'
|
||||||
|
exit 1
|
||||||
else
|
else
|
||||||
pkgctl license check
|
pkgctl license check
|
||||||
needsversioning+=(REUSE.toml LICENSE LICENSES/*)
|
needsversioning+=(REUSE.toml LICENSE LICENSES/*)
|
||||||
@@ -155,7 +154,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
|
||||||
|
@@ -124,7 +124,6 @@ pkgctl_build() {
|
|||||||
local RELEASE=0
|
local RELEASE=0
|
||||||
local DB_UPDATE=0
|
local DB_UPDATE=0
|
||||||
local INSTALL_TO_HOST=none
|
local INSTALL_TO_HOST=none
|
||||||
local UNSUPPORTED_ARCH=0
|
|
||||||
|
|
||||||
local REPO=
|
local REPO=
|
||||||
local PKGVER=
|
local PKGVER=
|
||||||
@@ -166,8 +165,7 @@ pkgctl_build() {
|
|||||||
BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
|
BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
|
||||||
elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
|
elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
|
||||||
if ! in_array "${2}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
|
if ! in_array "${2}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
|
||||||
warning 'unsupported architecture: %s' "${2}"
|
die 'invalid architecture: %s' "${2}"
|
||||||
UNSUPPORTED_ARCH=1
|
|
||||||
fi
|
fi
|
||||||
BUILD_ARCH+=("${2}")
|
BUILD_ARCH+=("${2}")
|
||||||
fi
|
fi
|
||||||
@@ -314,9 +312,6 @@ pkgctl_build() {
|
|||||||
|
|
||||||
# Update pacman cache for auto-detection
|
# Update pacman cache for auto-detection
|
||||||
if [[ -z ${REPO} ]]; then
|
if [[ -z ${REPO} ]]; then
|
||||||
if (( UNSUPPORTED_ARCH )); then
|
|
||||||
die "Unsupported architecture specified, cannot auto-detect repository"
|
|
||||||
fi
|
|
||||||
update_pacman_repo_cache multilib
|
update_pacman_repo_cache multilib
|
||||||
# Check valid repos if not resolved dynamically
|
# Check valid repos if not resolved dynamically
|
||||||
elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
|
elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
|
||||||
@@ -348,7 +343,7 @@ pkgctl_build() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# fail if an existing package specifies --repo
|
# fail if an existing package specifies --repo
|
||||||
if [[ -n "${repo}" ]] && [[ -n ${pkgrepo} ]] && (( ! UNSUPPORTED_ARCH )); then
|
if [[ -n "${repo}" ]] && [[ -n ${pkgrepo} ]]; then
|
||||||
# allow unstable to use --repo
|
# allow unstable to use --repo
|
||||||
if [[ ${pkgrepo} == *unstable ]]; then
|
if [[ ${pkgrepo} == *unstable ]]; then
|
||||||
repo=${pkgrepo}
|
repo=${pkgrepo}
|
||||||
|
@@ -188,13 +188,10 @@ path = [
|
|||||||
"README.md",
|
"README.md",
|
||||||
"keys/**",
|
"keys/**",
|
||||||
".SRCINFO",
|
".SRCINFO",
|
||||||
".gitignore",
|
|
||||||
".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