summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-09-17 20:30:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 09:54:32 (GMT)
commit9ad35b87070f67483dbc639c8274a6f30ae78165 (patch)
tree887de341378c10f607704e9dfba9bac010721b76 /meta/recipes-core
parentf3977f03a142c0d0ce0328626f12f43b5fd69121 (diff)
downloadpoky-9ad35b87070f67483dbc639c8274a6f30ae78165.tar.gz
systemd-systemctl-native: don't care about line endings
It's possible for a service file to accidentally contain mixed line endings, but the string cleanup code was assuming Unix endings. [ YOCTO #13535 ] (From OE-Core rev: 7aaa9200b5ba2cba92ee1ed7003d54848498b37d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rwxr-xr-xmeta/recipes-core/systemd/systemd-systemctl/systemctl2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index 8837f54..ebac863 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -57,7 +57,7 @@ class SystemdFile():
57 if skip_re.match(line): 57 if skip_re.match(line):
58 continue 58 continue
59 59
60 line = line.rstrip("\n") 60 line = line.strip()
61 m = section_re.match(line) 61 m = section_re.match(line)
62 if m: 62 if m:
63 if m.group('section') not in self.sections: 63 if m.group('section') not in self.sections: