From 8e7cd329b1c298e3c2c99a81914eee5c502de83b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 14 Feb 2012 13:44:05 +0000 Subject: scripts/combo-layer: avoid saving last revision if unchanged If we are running an update and the last revision hasn't changed since the last update, don't write to the configuration file. This avoids committing the config file with no changes other than spontaneous reordering of sections, which sometimes occurs due to the behaviour of the internal dictionary in Python's ConfigParser class. (This can be fixed properly but the fix is only easy in Python 2.7+ due to the availability there of the collections.OrderedDict class, and we currently want to be compatible with 2.6.x as well.) (From OE-Core rev: 4592f238de3fe6b0384c334774be9fcfc0985e4f) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/combo-layer | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/combo-layer b/scripts/combo-layer index 648dda2349..0f28cfa375 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -268,7 +268,8 @@ def action_apply_patch(conf, args): logger.info("After applying, run this tool again to apply the remaining patches") conf.update(name, "last_revision", lastrev) sys.exit(0) - conf.update(name, "last_revision", lastrev) + if lastrev != repo['last_revision']: + conf.update(name, "last_revision", lastrev) def action_splitpatch(conf, args): """ -- cgit v1.2.3-54-g00ecf