| 1 |
commit: ea1c6d16cf48074a257adfeff88d15b4eec3d5e2 |
| 2 |
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 28 23:53:43 2019 +0000 |
| 4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 28 23:54:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1c6d16 |
| 7 |
|
| 8 |
net-analyzer/nagios-plugins-linux-madrisan: avoid another collision |
| 9 |
|
| 10 |
Rename check_uptime to avoid a collision with |
| 11 |
net-analyzer/nagios-plugins. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/693008 |
| 14 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 15 |
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> |
| 16 |
|
| 17 |
...x-madrisan-25.ebuild => nagios-plugins-linux-madrisan-25-r1.ebuild} | 3 ++- |
| 18 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild |
| 21 |
similarity index 88% |
| 22 |
rename from net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25.ebuild |
| 23 |
rename to net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild |
| 24 |
index ce3bc9bb46c..6367fdc2f4e 100644 |
| 25 |
--- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25.ebuild |
| 26 |
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild |
| 27 |
@@ -25,7 +25,8 @@ S="${WORKDIR}/${MY_P}" |
| 28 |
src_prepare() { |
| 29 |
default |
| 30 |
# Avoid collision with net-analyzer/monitoring-plugins |
| 31 |
- sed -ri "s/check_(load|swap|users)/&_madrisan/" plugins/Makefile.am || die |
| 32 |
+ # and net-analyzer/nagios-plugins |
| 33 |
+ sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die |
| 34 |
eautoreconf |
| 35 |
} |
Archives