From 0ed991335873b350d72ebd3dac3df9380458bf72 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Sun, 21 Jul 2019 17:23:45 +0200 Subject: [PATCH] l'updater ora non applica i merge commits --- platformcode/updater.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platformcode/updater.py b/platformcode/updater.py index 7da7e6e6..daca1df3 100644 --- a/platformcode/updater.py +++ b/platformcode/updater.py @@ -73,6 +73,9 @@ def check_addon_init(): for c in reversed(commits[:pos]): commit = httptools.downloadpage(c['url']).data commitJson = json.loads(commit) + # evitiamo di applicare i merge commit + if 'Merge branch' in commitJson['commit']['message']: + continue logger.info('aggiornando a' + commitJson['sha']) alreadyApplied = True