summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/combo-layer12
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index f3480dcf5a..e2b180dc7e 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -230,6 +230,18 @@ def action_update(conf, args):
230 action_apply_patch(conf, args) 230 action_apply_patch(conf, args)
231 runcmd("rm -rf %s" % patch_dir) 231 runcmd("rm -rf %s" % patch_dir)
232 232
233 # Step 7: commit the updated config file if it's being tracked
234 relpath = os.path.relpath(conf.conffile)
235 try:
236 output = runcmd("git status --porcelain %s" % relpath)
237 except:
238 # Outside the repository
239 output = None
240 if output:
241 logger.info("Committing updated configuration file")
242 if output.lstrip().startswith("M"):
243 runcmd('git commit -m "Automatic commit to update last_revision" %s' % relpath)
244
233def action_apply_patch(conf, args): 245def action_apply_patch(conf, args):
234 """ 246 """
235 apply the generated patch list to combo repo 247 apply the generated patch list to combo repo