l'updater ora non applica i merge commits

2019-07-21 17:23:45 +02:00
parent 80a2cb8356
commit 0ed9913358
1 changed files with 3 additions and 0 deletions
--- 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