summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-14 13:44:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-21 17:00:46 (GMT)
commit8e7cd329b1c298e3c2c99a81914eee5c502de83b (patch)
treeceac8022732cfa68d8eef30a87c2016e936a9b55 /scripts/combo-layer
parentf273c04175463e8f529b1f7161bd964db4b57a83 (diff)
downloadpoky-8e7cd329b1c298e3c2c99a81914eee5c502de83b.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 648dda2..0f28cfa 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -268,7 +268,8 @@ def action_apply_patch(conf, args):
268 logger.info("After applying, run this tool again to apply the remaining patches") 268 logger.info("After applying, run this tool again to apply the remaining patches")
269 conf.update(name, "last_revision", lastrev) 269 conf.update(name, "last_revision", lastrev)
270 sys.exit(0) 270 sys.exit(0)
271 conf.update(name, "last_revision", lastrev) 271 if lastrev != repo['last_revision']:
272 conf.update(name, "last_revision", lastrev)
272 273
273def action_splitpatch(conf, args): 274def action_splitpatch(conf, args):
274 """ 275 """