From 0ccabae56d159620aa15aa778e431a0f5e2a7dd7 Mon Sep 17 00:00:00 2001 From: Robert Lippert Date: Tue, 28 Nov 2017 10:59:31 -0800 Subject: obmc-phosphor-systemd: fix string trim of instance name Python rstrip argument is a set of characters to strip and not a substring. This caused a weird build failure when the instance name happened to include some characters from the trailing part of the service name. Change-Id: Ib3263c709c7ca85a8c9f63c33945215b8443b806 Signed-off-by: Robert Lippert --- meta-phosphor/classes/obmc-phosphor-systemd.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index 10553c574..c6a2e6986 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -80,7 +80,7 @@ def SystemdUnit(unit): base = self.unit.replace('dbus-', '') base = base.replace('.%s' % cls, '') if self.is_instance: - base = base.rstrip('@%s' % self.instance) + base = base.replace('@%s' % self.instance, '') if self.is_template: base = base.rstrip('@') return base -- cgit v1.2.3