Fixed broken ubuntu and ubuntu_ports mirror checks #10

Merged
r389li merged 1 commits from jtoft-rt-4117 into master 4 months ago
  1. 3
      projects/ubuntu.py
  2. 9
      projects/ubuntu_releases.py
  3. 1
      shared.py

@ -5,6 +5,7 @@ Contains ubuntu class
import os
from project import Project
from shared import CSC_MIRROR
from shared import NUM_UBUNTU_RELEASES
import requests
import datefinder # another date finding library
from datetime import timedelta
@ -17,4 +18,4 @@ class ubuntu(Project):
@staticmethod
def check(data, project, current_time):
page = requests.get(data[project]["upstream"]).text
return page.count("Up to date") == 21
return page.count("Up to date") == NUM_UBUNTU_RELEASES

@ -5,6 +5,7 @@ Contains ubuntu_releases class
import os
from project import Project
from shared import CSC_MIRROR
from shared import NUM_UBUNTU_RELEASES
import requests
import datefinder # another date finding library
from datetime import timedelta
@ -17,10 +18,4 @@ class ubuntu_releases(Project):
@staticmethod
def check(data, project, current_time):
page = requests.get(data[project]["upstream"]).text
indexOfFile = page.find("last verified")
matches = list(datefinder.find_dates(page[indexOfFile:]))
date = matches[0].replace(tzinfo=None) # date is of type datetime.datetime
data[project]["out_of_sync_since"] = date.timestamp()
return(pd.to_datetime(current_time, unit='s') - date <= pd.to_timedelta(data[project]["out_of_sync_interval"], unit='s'))
# https://launchpad.net/ubuntu/+mirror/mirror.csclub.uwaterloo.ca-release
return page.count("Up to date") == NUM_UBUNTU_RELEASES

@ -1,3 +1,4 @@
"""Contains shared constants"""
CSC_MIRROR = "http://mirror.csclub.uwaterloo.ca/"
NUM_UBUNTU_RELEASES = 24

Loading…
Cancel
Save