From f7e63f1814234dd6f9b92bbabafb8a42319bf82c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 3 Apr 2018 16:19:53 +0800 Subject: update.py: add an option --timeout for lockfile We have an update.py running periodically in background, but we also need to run it manually, for example, run it to update actual_branch, the manually run usually failed because can't get lockfile, we have to run it again and again. A timeout option helps a lot in such a case. Now the following command can make sure we can run the command successfully: $ update.py -b master -a actual_branch -t 2000 Signed-off-by: Robert Yang Signed-off-by: Paul Eggleton --- layerindex/update.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'layerindex/update.py') diff --git a/layerindex/update.py b/layerindex/update.py index 07240abfb8..e4ca7b6fd4 100755 --- a/layerindex/update.py +++ b/layerindex/update.py @@ -156,6 +156,9 @@ def main(): parser.add_option("-l", "--layer", help = "Specify layers to update (use commas to separate multiple). Default is all published layers.", action="store", dest="layers") + parser.add_option("-t", "--timeout", + help = "Specify timeout in seconds to get layerindex.lock. Default is 30 seconds.", + type="int", action="store", dest="timeout", default=30) parser.add_option("-r", "--reload", help = "Reload recipe data instead of updating since last update", action="store_true", dest="reload") @@ -265,7 +268,7 @@ def main(): update.save() try: lockfn = os.path.join(fetchdir, "layerindex.lock") - lockfile = utils.lock_file(lockfn) + lockfile = utils.lock_file(lockfn, options.timeout, logger) if not lockfile: logger.error("Layer index lock timeout expired") sys.exit(1) -- cgit 1.2.3-korg