diff options
| author |   Aaron W. Swenson <aaron@grandmasfridge.org> | 2018-01-14 11:43:18 -0500 |
|---|---|---|
| committer | Aaron W. Swenson <aaron@grandmasfridge.org> | 2018-01-14 11:43:18 -0500 |
| commit | ba6b5e21ec7a85eb7521d0ae5c705ed791045104 (patch) | |
| tree | c806873e2d69ae24b2b381ac99eab0e51da8b162 | |
| parent | Bump version to 2.3 (diff) | |
| download | eselect-ba6b5e21.tar.gz eselect-ba6b5e21.tar.bz2 eselect-ba6b5e21.zip | |
Rename is_slot_link to is_active_slot_link
| -rw-r--r-- | postgresql.eselect | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/postgresql.eselect b/postgresql.eselect index 18b411b..f648956 100644 --- a/postgresql.eselect +++ b/postgresql.eselect @@ -285,7 +285,7 @@ do_unset() { # Get the file path that the link is pointing to. If it has the string # "postgresql-${slot}" somewhere in it, then it's a link that this module is # handling. - is_slot_link() { + is_active_slot_link() { if [[ $(canonicalise -m "$1") == *postgresql-${slot}* ]] ; then return 0 # yes else @@ -319,7 +319,7 @@ do_unset() { for path in "${paths[@]}" ; do # If $path is a link that belongs to the active slot, it can be removed # without invoking find. - if [[ -h "${path}" ]] && is_slot_link "${path}" ; then + if [[ -h "${path}" ]] && is_active_slot_link "${path}" ; then rm "${path}" || write_warning_msg "Couldn't remove: ${path}" continue fi @@ -331,7 +331,7 @@ do_unset() { [[ ${l} == ${USR_PATH}/bin/*${slot/.} ]] && continue [[ ${l} == ${USR_PATH}/share/man/man?/*${slot/.}* ]] && continue - if is_slot_link "${l}" ; then + if is_active_slot_link "${l}" ; then rm "${l}" || write_warning_msg "Couldn't remove: ${l}" fi done |