| 1 |
commit: 8f9dc630bef434841f8b8a6f9ba6f263a0d1cd70 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 2 05:42:22 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 2 07:08:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9dc630 |
| 7 |
|
| 8 |
net-fs/nfs-utils: Don't assume REPLACING_VERSIONS is singular |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/589488 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
net-fs/nfs-utils/nfs-utils-2.3.3.ebuild | 14 ++++++++------ |
| 14 |
net-fs/nfs-utils/nfs-utils-2.3.4.ebuild | 14 ++++++++------ |
| 15 |
net-fs/nfs-utils/nfs-utils-2.4.1.ebuild | 14 ++++++++------ |
| 16 |
3 files changed, 24 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild |
| 19 |
index b98297ce0b0..77465d97e58 100644 |
| 20 |
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild |
| 21 |
+++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild |
| 22 |
@@ -179,12 +179,14 @@ pkg_postinst() { |
| 23 |
done |
| 24 |
|
| 25 |
if systemd_is_booted; then |
| 26 |
- if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then |
| 27 |
- ewarn "We have switched to upstream systemd unit files. Since" |
| 28 |
- ewarn "they got renamed, you should probably enable the new ones." |
| 29 |
- ewarn "You can run 'equery files nfs-utils | grep systemd'" |
| 30 |
- ewarn "to know what services you need to enable now." |
| 31 |
- fi |
| 32 |
+ for v in ${REPLACING_VERSIONS}; do |
| 33 |
+ if ver_test "${v}" -lt 1.3.0; then |
| 34 |
+ ewarn "We have switched to upstream systemd unit files. Since" |
| 35 |
+ ewarn "they got renamed, you should probably enable the new ones." |
| 36 |
+ ewarn "You can run 'equery files nfs-utils | grep systemd'" |
| 37 |
+ ewarn "to know what services you need to enable now." |
| 38 |
+ fi |
| 39 |
+ done |
| 40 |
else |
| 41 |
ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." |
| 42 |
ewarn "If you were using nfsmount, please add nfsclient and netmount to the" |
| 43 |
|
| 44 |
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild |
| 45 |
index dafe5f83ce3..975b78c549b 100644 |
| 46 |
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild |
| 47 |
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild |
| 48 |
@@ -176,12 +176,14 @@ pkg_postinst() { |
| 49 |
done |
| 50 |
|
| 51 |
if systemd_is_booted; then |
| 52 |
- if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then |
| 53 |
- ewarn "We have switched to upstream systemd unit files. Since" |
| 54 |
- ewarn "they got renamed, you should probably enable the new ones." |
| 55 |
- ewarn "You can run 'equery files nfs-utils | grep systemd'" |
| 56 |
- ewarn "to know what services you need to enable now." |
| 57 |
- fi |
| 58 |
+ for v in ${REPLACING_VERSIONS}; do |
| 59 |
+ if ver_test "${v}" -lt 1.3.0; then |
| 60 |
+ ewarn "We have switched to upstream systemd unit files. Since" |
| 61 |
+ ewarn "they got renamed, you should probably enable the new ones." |
| 62 |
+ ewarn "You can run 'equery files nfs-utils | grep systemd'" |
| 63 |
+ ewarn "to know what services you need to enable now." |
| 64 |
+ fi |
| 65 |
+ done |
| 66 |
else |
| 67 |
ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." |
| 68 |
ewarn "If you were using nfsmount, please add nfsclient and netmount to the" |
| 69 |
|
| 70 |
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild |
| 71 |
index aff15752fd0..0fcea1be6f2 100644 |
| 72 |
--- a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild |
| 73 |
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild |
| 74 |
@@ -187,12 +187,14 @@ pkg_postinst() { |
| 75 |
done |
| 76 |
|
| 77 |
if systemd_is_booted; then |
| 78 |
- if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then |
| 79 |
- ewarn "We have switched to upstream systemd unit files. Since" |
| 80 |
- ewarn "they got renamed, you should probably enable the new ones." |
| 81 |
- ewarn "You can run 'equery files nfs-utils | grep systemd'" |
| 82 |
- ewarn "to know what services you need to enable now." |
| 83 |
- fi |
| 84 |
+ for v in ${REPLACING_VERSIONS}; do |
| 85 |
+ if ver_test "${v}" -lt 1.3.0; then |
| 86 |
+ ewarn "We have switched to upstream systemd unit files. Since" |
| 87 |
+ ewarn "they got renamed, you should probably enable the new ones." |
| 88 |
+ ewarn "You can run 'equery files nfs-utils | grep systemd'" |
| 89 |
+ ewarn "to know what services you need to enable now." |
| 90 |
+ fi |
| 91 |
+ done |
| 92 |
else |
| 93 |
ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." |
| 94 |
ewarn "If you were using nfsmount, please add nfsclient and netmount to the" |
Archives