[oe-commits] [openembedded-core] 12/12: wic/engine: Add missing newline

[git at git.openembedded.org]

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

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

commit 2f3adb21cc5067458a12964d0bde235966a20a60
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Apr 3 12:52:48 2019 +0100

    wic/engine: Add missing newline
    
    On some hosts the wic.Wic2.test_wic_cp_ext selftest was failing as files weren't
    being copied into the rootfs with "wic cp". This was due to a bug added by:
    
    http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=89d4a8df074598cfb3a76e41db7c45d845afd961
    
    where there should be a second newline added at the end of the expression due
    to the difference in the way echo -e and printf behave.
    
    [YOCTO #13237]
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/wic/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index ea600d2..ab33fa6 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -338,7 +338,7 @@ class Disk:
     def copy(self, src, pnum, path):
         """Copy partition image into wic image."""
         if self.partitions[pnum].fstype.startswith('ext'):
-            cmd = "printf 'cd {}\nwrite {} {}' | {} -w {}".\
+            cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\
                       format(path, src, os.path.basename(src),
                              self.debugfs, self._get_part_image(pnum))
         else: # fat

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