[oe-commits] [openembedded-core] 18/24: systemd-systemctl-native: don't care about line endings

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit dbf0329346acecb5628d241253f1bb1c1a949146
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Sep 17 21:30:30 2019 +0100

    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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 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():
                 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.