[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/

[Matthew Thode]

commit:     707ad6927c6de735e8718d9c823c9ee616bfa9bb
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 20:01:23 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 20:01:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707ad692

net-misc/openvswitch: clean up trailing slashes

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 net-misc/openvswitch/openvswitch-2.13.0.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
index 6d6ed76b011..cf9fdf94575 100644
--- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
@@ -96,14 +96,14 @@ src_install() {
 			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
 			python_foreach_impl python_doscript utilities/"${SCRIPT}"
 		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+		rm -r "${ED%}"/usr/share/openvswitch/python || die
 	fi
 
 	keepdir /var/{lib,log}/openvswitch
 	keepdir /etc/ssl/openvswitch
 	fperms 0750 /etc/ssl/openvswitch
 
-	rm -rf "${ED%/}"/var/run || die
+	rm -rf "${ED%}"/var/run || die
 
 	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
 	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
@@ -132,15 +132,15 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	local db="${EROOT%}"/var/lib/openvswitch/conf.db
 	if [[ -e "${db}" ]] ; then
 		einfo "Database '${db}' already exists, doing schema migration..."
 		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
 		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+			"${EROOT%}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
 	else
 		einfo "Creating new database '${db}'..."
 		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+			"${EROOT%}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
 	fi
 }