diff options
author | Matthias Dienstbier <mdienstbier@googlemail.com> | 2010-03-24 18:43:01 +0100 |
---|---|---|
committer | Matthias Dienstbier <mdienstbier@googlemail.com> | 2010-03-24 18:43:01 +0100 |
commit | 447fc52078b7e9a78e1db3590161be16cec170a3 (patch) | |
tree | dc8cb857c79978980f509a0a86f3d5a498e2384b /src/core | |
parent | 47fbd4531a556e62be50b12f3376e73e9caaa4c7 (diff) |
fix returns and exits in subshells
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 2 | ||||
-rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index be4c270..07eee5d 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -742,7 +742,7 @@ process_filesystem () # don't handle anything else here, we will error later esac BLOCK_ROLLBACK_USELESS=0 - [ "$ret" -gt 0 ] && ( show_warning "process_filesystem error" "Error creating filesystem $fs_type on $part." ; return 1 ) + [ "$ret" -gt 0 ] && { show_warning "process_filesystem error" "Error creating filesystem $fs_type on $part."; return 1; } sleep 2 fi diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 541ce23..239eab0 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -753,7 +753,7 @@ interactive_filesystems() { interactive_select_packages() { # set up our install location if necessary and sync up so we can get package lists - target_prepare_pacman || ( show_warning 'Pacman preparation failure' "Pacman preparation failed! Check $LOG for errors." && return 1 ) + target_prepare_pacman || { show_warning 'Pacman preparation failure' "Pacman preparation failed! Check $LOG for errors."; return 1; } repos=`list_pacman_repos target` notify "Package selection is split into two stages. First you will select package groups that contain packages you may be interested in. Then you will be presented with a full list of packages for each group, allowing you to fine-tune.\n\n |