[OE-core] [PATCH] systemd-systemctl-native: don't care about line endings
Ross Burton
ross.burton at intel.com
Tue Sep 17 20:30:30 UTC 2019
It's possible for a service file to accidentally contain mixed line endings, but
the string cleanup code was assuming Unix endings.
[ YOCTO #13535 ]
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index 8837f54e166..ebac863739a 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -57,7 +57,7 @@ class SystemdFile():
if skip_re.match(line):
continue
- line = line.rstrip("\n")
+ line = line.strip()
m = section_re.match(line)
if m:
if m.group('section') not in self.sections:
--
2.20.1
More information about the Openembedded-core
mailing list