summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarcus Flyckt <marcus.flyckt@gmail.com>2023-10-06 08:23:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-08 13:05:24 +0100
commit30a9f7de45050c8bac49d4b37419cc2e067a75fa (patch)
tree9e4058902452e8c0453272dd643268db3408fbf0 /scripts
parent3f4921ced1e2aae546ff7cef232eec3e214c28be (diff)
downloadopenembedded-core-30a9f7de45050c8bac49d4b37419cc2e067a75fa.tar.gz
devtool/upgrade: check all git config locations
Fixes [YOCTO #15222] In some situations its more practical to keep git configuration at `/etc/gitconfig` instead of `$HOME/.gitconfig` (e.g., when mounting git configuration into a docker container). This change makes `devtool upgrade` consider any available git configuration instead of only checking `--global`. Signed-off-by: Marcus Flyckt <marcus.flyckt@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 487308912f..9cd50be3a2 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -442,7 +442,7 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, srcsubdir_old, src
def _check_git_config():
def getconfig(name):
try:
- value = bb.process.run('git config --global %s' % name)[0].strip()
+ value = bb.process.run('git config %s' % name)[0].strip()
except bb.process.ExecutionError as e:
if e.exitcode == 1:
value = None