From: Paul Eggleton Date: Fri, 20 Jan 2017 01:49:02 +0000 (+1300) Subject: oe-selftest: devtool: remove use of git -C X-Git-Tag: uninative-1.5~749 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ce5c7075d530c0950f2feed35f95fbcd9f50721f;p=openembedded-core.git 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. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 887c1e6b4c..dc3435fc2b 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')