[OE-core] [PATCH 1/1] oe-selftest: devtool: remove use of git -C

Paul Eggleton paul.eggleton at linux.intel.com
Fri Jan 20 02:06:04 UTC 2017


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 <paul.eggleton at linux.intel.com>
---
 meta/lib/oeqa/selftest/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 94b6b39..face8b8 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -473,7 +473,7 @@ class DevtoolTests(DevtoolBase):
         manfile = os.path.join(pkgd, mandir, 'man8', 'mdadm.8')
         check_TH_line(manfile, '.TH MDADM 8 "" v9.999-custom', 'man file not modified. man searched file path: %s' % manfile)
         # Test reverting the change
-        result = runCmd("git -C %s checkout -- %s" % (tempdir, modfile))
+        result = runCmd("git checkout -- %s" % modfile, cwd=tempdir)
         check_TH_line(modfile, '.TH MDADM 8 "" v3.4', 'man .in file not restored (git failed)')
         bitbake('mdadm -c package')
         pkgd = get_bb_var('PKGD', 'mdadm')
-- 
2.5.5




More information about the Openembedded-core mailing list