diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2016-11-05 18:08:16 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-12-05 15:20:08 +1000 |
| commit | 5dd764eb47e0109407702a4064e74dc25df3c982 (patch) | |
| tree | 8564db1bd3c29c09426db39bd0d7e73a2de2184a | |
| parent | 46101bea1c1232621fa80409586b5eeeaefdac47 (diff) | |
| download | pacman-5dd764eb47e0109407702a4064e74dc25df3c982.tar.xz | |
makepkg: abort on lint_package errors
Allows lint_package to prevent makepkg from creating an invalid package.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/libmakepkg/lint_package.sh.in | 4 | ||||
| -rw-r--r-- | scripts/libmakepkg/lint_package/build_references.sh.in | 1 | ||||
| -rw-r--r-- | scripts/libmakepkg/lint_package/missing_backup.sh.in | 1 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/scripts/libmakepkg/lint_package.sh.in b/scripts/libmakepkg/lint_package.sh.in index 82b8b9b8..f5bd9792 100644 --- a/scripts/libmakepkg/lint_package.sh.in +++ b/scripts/libmakepkg/lint_package.sh.in @@ -40,7 +40,9 @@ lint_package() { cd_safe "$pkgdir" msg "$(gettext "Checking for packaging issue...")" + local ret=0 for func in ${lint_package_functions[@]}; do - $func + $func || ret=1 done + return $ret } diff --git a/scripts/libmakepkg/lint_package/build_references.sh.in b/scripts/libmakepkg/lint_package/build_references.sh.in index 514ec053..cae98526 100644 --- a/scripts/libmakepkg/lint_package/build_references.sh.in +++ b/scripts/libmakepkg/lint_package/build_references.sh.in @@ -37,4 +37,5 @@ warn_build_references() { printf '%s\n' "${refs[@]}" >&2 fi done + return 0 } diff --git a/scripts/libmakepkg/lint_package/missing_backup.sh.in b/scripts/libmakepkg/lint_package/missing_backup.sh.in index 727a18bf..1963627a 100644 --- a/scripts/libmakepkg/lint_package/missing_backup.sh.in +++ b/scripts/libmakepkg/lint_package/missing_backup.sh.in @@ -35,4 +35,5 @@ warn_missing_backup() { warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" fi done + return 0 } diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ca494353..20004516 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1167,7 +1167,7 @@ run_split_packaging() { backup_package_variables run_package $pkgname tidy_install - lint_package + lint_package || exit 1 create_package create_debug_package restore_package_variables @@ -1605,7 +1605,7 @@ if (( INFAKEROOT )); then run_package fi tidy_install - lint_package + lint_package || exit 1 create_package create_debug_package else |