summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-14 13:44:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-21 17:00:45 (GMT)
commitf273c04175463e8f529b1f7161bd964db4b57a83 (patch)
tree095f568ff27f2d37d95224c9d189cab6a78375f3 /scripts/combo-layer
parent0656f57235c9292f5e5dbc7151f74e1bfcff6ebd (diff)
downloadpoky-f273c04175463e8f529b1f7161bd964db4b57a83.tar.gz
scripts/combo-layer: avoid error when config file is outside repo
Avoid displaying the error from the "git status" command we use to check the status of the config file if the config file is outside of the repository (a situation that is already handled). (From OE-Core rev: 9d3e54057673348e85ba479705c4ffaad56973d6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index b4b1e48..648dda2 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -79,7 +79,7 @@ class Configuration(object):
79 logger.error("ERROR: patchutils package is missing, please install it (e.g. # apt-get install patchutils)") 79 logger.error("ERROR: patchutils package is missing, please install it (e.g. # apt-get install patchutils)")
80 sys.exit(1) 80 sys.exit(1)
81 81
82def runcmd(cmd,destdir=None): 82def runcmd(cmd,destdir=None,printerr=True):
83 """ 83 """
84 execute command, raise CalledProcessError if fail 84 execute command, raise CalledProcessError if fail
85 return output if succeed 85 return output if succeed
@@ -90,7 +90,8 @@ def runcmd(cmd,destdir=None):
90 subprocess.check_call(cmd, stdout=out, stderr=out, cwd=destdir, shell=True) 90 subprocess.check_call(cmd, stdout=out, stderr=out, cwd=destdir, shell=True)
91 except subprocess.CalledProcessError,e: 91 except subprocess.CalledProcessError,e:
92 out.seek(0) 92 out.seek(0)
93 logger.error("%s" % out.read()) 93 if printerr:
94 logger.error("%s" % out.read())
94 raise e 95 raise e
95 96
96 out.seek(0) 97 out.seek(0)
@@ -233,7 +234,7 @@ def action_update(conf, args):
233 # Step 7: commit the updated config file if it's being tracked 234 # Step 7: commit the updated config file if it's being tracked
234 relpath = os.path.relpath(conf.conffile) 235 relpath = os.path.relpath(conf.conffile)
235 try: 236 try:
236 output = runcmd("git status --porcelain %s" % relpath) 237 output = runcmd("git status --porcelain %s" % relpath, printerr=False)
237 except: 238 except:
238 # Outside the repository 239 # Outside the repository
239 output = None 240 output = None