diff options
| author |   Ross Burton <ross.burton@intel.com> | 2019-09-17 21:30:30 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-19 10:54:26 +0100 |
| commit | 7aaa9200b5ba2cba92ee1ed7003d54848498b37d (patch) | |
| tree | a632e5d22c74c4b8e0fd092bcc6363b5d6be8a92 /meta | |
| parent | 70a77b91031388ea29eff6b8885fd25cc35b1dae (diff) | |
| download | openembedded-core-contrib-7aaa9200b5ba2cba92ee1ed7003d54848498b37d.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 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rwxr-xr-x | meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 |
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 8837f54e16..ebac863739 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: |