diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
| commit | 98cc5cd6483975b64d80e8323f7f659dd1337d75 (patch) | |
| tree | 5fa64e93d57396bc4c76aa3537156205b4b424ac /meta-phosphor/recipes-core/os-release/os-release.bbappend | |
| parent | 82dbc15a05125a812c140a3c8cff81c366482229 (diff) | |
| parent | 8fc454f9beebdd347403145c991697019a593cff (diff) | |
| download | openbmc-98cc5cd6483975b64d80e8323f7f659dd1337d75.tar.xz | |
Merge tag '0.29' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-core/os-release/os-release.bbappend')
| -rw-r--r-- | meta-phosphor/recipes-core/os-release/os-release.bbappend | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 0f938c392..5d4a4afbc 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -8,9 +8,11 @@ def run_git(d, cmd): try: oeroot = d.getVar('COREBASE', True) - return bb.process.run("git --work-tree %s --git-dir %s/.git %s" + return bb.process.run(("export PSEUDO_DISABLED=1; " + + "git --work-tree %s --git-dir %s/.git %s") % (oeroot, oeroot, cmd))[0].strip('\n') - except: + except Exception as e: + bb.warn("Unexpected exception from 'git' call: %s" % e) pass VERSION_ID := "${@run_git(d, 'describe --dirty --long')}" |