summaryrefslogtreecommitdiff
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-14 13:44:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-21 14:55:51 +0000
commit4592f238de3fe6b0384c334774be9fcfc0985e4f (patch)
tree0329b5df1038c6d826a11016e6b6a1ab181e75cf /scripts/combo-layer
parent9d3e54057673348e85ba479705c4ffaad56973d6 (diff)
downloadopenembedded-core-4592f238de3fe6b0384c334774be9fcfc0985e4f.tar.gz
openembedded-core-4592f238de3fe6b0384c334774be9fcfc0985e4f.tar.bz2
openembedded-core-4592f238de3fe6b0384c334774be9fcfc0985e4f.zip
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.) 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 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):
"""