index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Eli Schwartz <eschwartz@archlinux.org> | 2020-06-02 17:50:24 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2020-06-11 10:54:54 +1000 |
commit | bf458cced7c0845f7b6fabb887d3878ae4cd51b2 (patch) | |
tree | 974ba5f685f644d160e1535283565f523af3c40e /scripts/makepkg.sh.in | |
parent | 381e11375569fa7588b1297e0e744749bdafe8f5 (diff) |
-rw-r--r-- | scripts/makepkg.sh.in | 16 |
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f2859740..caf809f3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -220,7 +220,7 @@ update_pkgver() { # Print 'source not found' error message and exit makepkg missing_source_file() { error "$(gettext "Unable to find source file %s.")" "$(get_filename "$1")" - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" exit $E_MISSING_FILE } @@ -355,7 +355,7 @@ error_function() { # first exit all subshells, then print the error if (( ! BASH_SUBSHELL )); then error "$(gettext "A failure occurred in %s().")" "$1" - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" fi exit $E_USER_FUNCTION_FAILED } @@ -674,7 +674,7 @@ create_package() { if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "\$pkgdir/" - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" exit $E_MISSING_PKGDIR fi @@ -1147,23 +1147,23 @@ lint_config || exit $E_CONFIG_ERROR # check that all settings directories are user-writable if ! ensure_writable_dir "BUILDDIR" "$BUILDDIR"; then - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi if (( ! (NOBUILD || GENINTEG) )) && ! ensure_writable_dir "PKGDEST" "$PKGDEST"; then - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi if ! ensure_writable_dir "SRCDEST" "$SRCDEST" ; then - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi if (( SOURCEONLY )); then if ! ensure_writable_dir "SRCPKGDEST" "$SRCPKGDEST"; then - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi @@ -1173,7 +1173,7 @@ if (( SOURCEONLY )); then fi if (( LOGGING )) && ! ensure_writable_dir "LOGDEST" "$LOGDEST"; then - plain "$(gettext "Aborting...")" + plainerr "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi |