diff options
author | Christian Rebischke <chris@nullday.de> | 2020-01-03 16:26:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-03 16:26:45 +0100 |
commit | a539293a0861bcb1987a2135554b774be8a62c9e (patch) | |
tree | 4c340609a4f88b03a842b1ac05e7fadd551825f8 | |
parent | abb5429542569e4e43deaa76ec39eaf69490661e (diff) | |
parent | 031e245dee2e6aaccb7fe3028f3c8ea63c5fab56 (diff) |
Merge pull request #72 from shibumi/shibumi/fix-is-latest-logic1.4.0
fix bug #71
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | controller.py | 11 |
2 files changed, 8 insertions, 4 deletions
@@ -2,3 +2,4 @@ packer_cache/ *.box *.swp output-* +.vscode diff --git a/controller.py b/controller.py index 5126e34..5394ee7 100755 --- a/controller.py +++ b/controller.py @@ -12,8 +12,7 @@ import subprocess import os.path API_URL = 'https://app.vagrantup.com/api/v1/box/archlinux/archlinux' -NOW = datetime.datetime.now() -THIS_MONTH = int(NOW.strftime("%m")) +NOW = datetime.date.today() LEN_RELEASES = 2 CWD = '/srv/arch-boxes/arch-boxes' ISO_PATH = '/srv/ftp/iso/latest/archlinux-' + NOW.strftime( @@ -58,8 +57,12 @@ def determine_missing_release(release_providers): def is_latest(release_version): - release_month = int(release_version.split(".")[1]) - return THIS_MONTH <= release_month + # we need to use .date() here, otherwise the compare is going to fail + release = datetime.datetime.strptime(release_version, "%Y.%m.%d").date() + # set the day to 1, because we only want to check for month and year + release = release.replace(day=1) + current_release = NOW.replace(day=1) + return current_release <= release def all_released(release_providers): |