From a5f884455b5067930b98939b3b00bdd77db63244 Mon Sep 17 00:00:00 2001 From: Larry Ruckman Date: Thu, 30 Jun 2022 12:24:39 -0700 Subject: [PATCH 1/4] firmwareRelease.py bug fix --- scripts/firmwareRelease.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/firmwareRelease.py b/scripts/firmwareRelease.py index ec1cb69a..d7c64396 100644 --- a/scripts/firmwareRelease.py +++ b/scripts/firmwareRelease.py @@ -586,7 +586,7 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev): oldTagExist = False newTagExist = False for tagIdx in locRepo.tags: - if str(tagIdx) == prev: + if (str(tagIdx) == prev) and (oldTagExist != ''): oldTagExist = True if str(tagIdx) == ver: newTagExist = True @@ -599,7 +599,7 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev): oldTagExist = False newTagExist = False for tagIdx in remRepo.get_tags(): - if tagIdx.name == prev: + if (tagIdx.name == prev) and (oldTagExist != ''): oldTagExist = True if tagIdx.name == ver: newTagExist = True From eb43c20300fcdc9e5854317a055e090615b2aa44 Mon Sep 17 00:00:00 2001 From: Larry Ruckman Date: Thu, 30 Jun 2022 12:26:29 -0700 Subject: [PATCH 2/4] firmwareRelease.py bug fix --- scripts/firmwareRelease.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/firmwareRelease.py b/scripts/firmwareRelease.py index d7c64396..55c72da3 100644 --- a/scripts/firmwareRelease.py +++ b/scripts/firmwareRelease.py @@ -586,11 +586,11 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev): oldTagExist = False newTagExist = False for tagIdx in locRepo.tags: - if (str(tagIdx) == prev) and (oldTagExist != ''): + if str(tagIdx) == prev: oldTagExist = True if str(tagIdx) == ver: newTagExist = True - if not oldTagExist: + if not oldTagExist and (oldTagExist != ''): raise(Exception(f'local repo: oldTag={prev} does NOT exist')) if newTagExist: raise(Exception(f'local repo: newTag={ver} already does exist')) @@ -599,11 +599,11 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev): oldTagExist = False newTagExist = False for tagIdx in remRepo.get_tags(): - if (tagIdx.name == prev) and (oldTagExist != ''): + if tagIdx.name == prev: oldTagExist = True if tagIdx.name == ver: newTagExist = True - if not oldTagExist: + if not oldTagExist and (oldTagExist != ''): raise(Exception(f'remote repo: oldTag={prev} does NOT exist')) if newTagExist: raise(Exception(f'remote repo: newTag={ver} already does exist')) From 34c7328208a0419a1ecd2a872f5df63098bb3832 Mon Sep 17 00:00:00 2001 From: Larry Ruckman Date: Thu, 30 Jun 2022 12:27:34 -0700 Subject: [PATCH 3/4] firmwareRelease.py bug fix --- scripts/firmwareRelease.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/firmwareRelease.py b/scripts/firmwareRelease.py index 55c72da3..459e92dd 100644 --- a/scripts/firmwareRelease.py +++ b/scripts/firmwareRelease.py @@ -590,7 +590,7 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev): oldTagExist = True if str(tagIdx) == ver: newTagExist = True - if not oldTagExist and (oldTagExist != ''): + if not oldTagExist and (prev != ''): raise(Exception(f'local repo: oldTag={prev} does NOT exist')) if newTagExist: raise(Exception(f'local repo: newTag={ver} already does exist')) @@ -603,7 +603,7 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev): oldTagExist = True if tagIdx.name == ver: newTagExist = True - if not oldTagExist and (oldTagExist != ''): + if not oldTagExist and (prev != ''): raise(Exception(f'remote repo: oldTag={prev} does NOT exist')) if newTagExist: raise(Exception(f'remote repo: newTag={ver} already does exist')) From 0f4ca2f7534d2b8127af1c2bad7e075cef5fefd4 Mon Sep 17 00:00:00 2001 From: Larry Ruckman Date: Thu, 21 Jul 2022 07:53:51 -0700 Subject: [PATCH 4/4] Update .gitignore Adding .htm to the list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 500c6d75..24b054d9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ *.bin *.ld *.dat +*.htm # Matlab *.autosave