diff options
| author |   Reinis Danne <rei4dan@gmail.com> | 2014-01-21 20:01:46 +0200 |
|---|---|---|
| committer | Reinis Danne <rei4dan@gmail.com> | 2014-01-21 20:01:46 +0200 |
| commit | 83bd255e6aacd81a436b001623a67b91f877cf16 (patch) | |
| tree | b876e42a86844f3570dc477b81b6b709ad35b402 /eclass/alternatives-2.eclass | |
| parent | Version bump (diff) | |
| parent | masking live eselect (diff) | |
| download | sci-83bd255e6aacd81a436b001623a67b91f877cf16.tar.gz sci-83bd255e6aacd81a436b001623a67b91f877cf16.tar.bz2 sci-83bd255e6aacd81a436b001623a67b91f877cf16.zip | |
Merge github.com:gentoo-science/sci
Diffstat (limited to 'eclass/alternatives-2.eclass')
| -rw-r--r-- | eclass/alternatives-2.eclass | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass index 38a0328bf..fe2f55e95 100644 --- a/eclass/alternatives-2.eclass +++ b/eclass/alternatives-2.eclass @@ -147,13 +147,18 @@ alternatives-2_pkg_prerm() { #echo "Making sure ${alt} has a valid provider" #echo eselect "${alt}" update${ignore} "${provider}" eselect "${alt}" update${ignore} "${provider}" && continue - einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)" - if [[ $? -eq 2 ]]; then - einfo "Cleaning up unused alternatives module for ${alt}" - echo rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" - rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" || - eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed - fi + einfo "Removing ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)" + case $? in + 0) : ;; + 2) + einfo "Cleaning up unused alternatives module for ${alt}" + rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" || \ + eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed + ;; + *) + eerror eselect "${alt}" update "${provider}" returned $? + ;; + esac done } |