[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4158/8267] oe-selftest: devtool: remove use of git -C



commit b1b59b8a4b3e5962ecb036a9011ea9d202eda793
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Fri Jan 20 14:49:02 2017 +1300

    oe-selftest: devtool: remove use of git -C
    
    The -C option isn't available in versions of git older than 1.8.5,
    and officially we only require git 1.8.3.1 or newer (and the latter is
    the version you'll find on CentOS 7, so the test fails there). In any
    case we can simply specify the working directory to runCmd() so just
    do that instead.
    
    (From OE-Core rev: ce5c7075d530c0950f2feed35f95fbcd9f50721f)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/devtool.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 887c1e6..dc3435f 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -461,7 +461,7 @@ class DevtoolTests(DevtoolBase):
         bitbake('mdadm -c package')
         check_line(manfile, 'antique pin sardine', 'man file not modified. man searched file path: %s' % 
manfile)
 
-        result = runCmd('git -C %s checkout -- %s' % (tempdir, modfile))
+        result = runCmd('git checkout -- %s' % modfile, cwd=tempdir)
         check_line(modfile, 'Linux Software RAID', 'man .in file not restored (git failed)')
 
         bitbake('mdadm -c package')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]