Skip to content

Commit 9af17d1

Browse files
authored
A refactoring went wrong and some method are not called correclty (#743)
1 parent c3c7dd7 commit 9af17d1

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

Framework/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ install(FILES script/RepoCleaner/rules/1_per_hour.py
400400
script/RepoCleaner/rules/skip.py
401401
script/RepoCleaner/rules/1_per_run.py
402402
script/RepoCleaner/rules/none_kept.py
403+
script/RepoCleaner/rules/last_only.py
403404
DESTINATION lib)
404405

405406
# ---- Copy test files ----

Framework/script/RepoCleaner/rules/1_per_hour.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def process(ccdb: Ccdb, object_path: str, delay: int, #migration: bool,
3232
deletion_list: List[ObjectVersion] = []
3333
update_list: List[ObjectVersion] = []
3434
for v in versions:
35-
if last_preserved == None or last_preserved.validFromAsDatetime < v.validFromAsDt - timedelta(hours=1):
35+
if last_preserved == None or last_preserved.validFromAsDt < v.validFromAsDt - timedelta(hours=1):
3636
# first extend validity of the previous preserved (should we take into account the run ?)
3737
if last_preserved != None:
3838
ccdb.updateValidity(last_preserved, last_preserved.validFrom, str(int(v.validFrom) - 1))

Framework/script/RepoCleaner/rules/1_per_run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def process(ccdb: Ccdb, object_path: str, delay: int, extra_params: Dict[str, st
6262
freshest: ObjectVersion = None
6363
for v in run_versions:
6464
# logging.debug(f" - version {v}")
65-
if freshest is None or freshest.validFromAsDatetime < v.validFromAsDt:
65+
if freshest is None or freshest.validFromAsDt < v.validFromAsDt:
6666
if freshest is not None:
6767
if in_grace_period(freshest, delay):
6868
preservation_list.append(freshest)

Framework/script/RepoCleaner/rules/last_only.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def process(ccdb: Ccdb, object_path: str, delay: int, extra_params: Dict[str, st
2828
deletion_list: List[ObjectVersion] = []
2929
# find the earliest
3030
for v in versions:
31-
if earliest == None or v.validFromAsDt > earliest.validFromAsDatetime:
31+
if earliest == None or v.validFromAsDt > earliest.validFromAsDt:
3232
earliest = v
3333
logging.debug(f"earliest : {earliest}")
3434

0 commit comments

Comments
 (0)