[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3850/8267] oe-selftest: import git module only when needed

[Emmanuele Bassi <ebassi src gnome org>]

commit 2f4008d6948a85ed8c35ffcc8dbfaa47d406c55d
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Mon Dec 19 15:51:43 2016 +0200

    oe-selftest: import git module only when needed
    
    git module is not included into standard Python
    library and therefore causes import errors on the systems
    where PythonGit is not installed.
    
    As git module only used in the code implementing --repository
    functionality it's better to import git only in the scope
    that requires it.
    
    [YOCTO #10821]
    
    (From OE-Core rev: 66be32c1a075201d6ee0e9b9e10b84e6a2ace745)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/utils/metadata.py |    2 +-
 scripts/oe-selftest             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index ecbe763..5d8bf84 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -5,7 +5,6 @@
 # Functions to get metadata from the testing host used
 # for analytics of test results.
 
-from git import Repo, InvalidGitRepositoryError, NoSuchPathError
 from collections import OrderedDict
 from collections.abc import MutableMapping
 from xml.dom.minidom import parseString
@@ -46,6 +45,7 @@ def metadata_from_data_store(d):
 
 def get_layers(layers):
     """ Returns layer name, branch, and revision as OrderedDict. """
+    from git import Repo, InvalidGitRepositoryError, NoSuchPathError
 
     layer_dict = OrderedDict()
     for layer in layers.split():
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index f4b861f..bfcea66 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -36,7 +36,6 @@ import re
 import fnmatch
 import collections
 import imp
-import git
 
 sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)) + '/lib')
 import scriptpath
@@ -577,6 +576,7 @@ def main():
         log.info("Finished")
 
         if args.repository:
+            import git
             # Commit tests results to repository
             metadata = metadata_from_bb()
             git_dir = os.path.join(os.getcwd(), 'selftest')