From 232a125139acb30df48e099da102b77a8076800a Mon Sep 17 00:00:00 2001 From: Raymond Li Date: Sat, 1 Jan 2022 14:54:28 -0500 Subject: [PATCH] Fix parameter mismatch --- projects/linuxmint.py | 4 ++-- projects/linuxmint_packages.py | 4 ++-- projects/macports.py | 2 +- projects/mxlinux_iso.py | 4 ++-- projects/netbsd.py | 4 ++-- projects/opensuse.py | 4 ++-- projects/puppy_linux.py | 4 ++-- projects/racket.py | 4 ++-- projects/raspberrypi.py | 4 ++-- projects/sage.py | 2 +- projects/slackware.py | 4 ++-- projects/trisquel.py | 4 ++-- projects/ubuntu_ports.py | 4 ++-- projects/ubuntu_ports_releases.py | 4 ++-- projects/x_org.py | 4 ++-- projects/xiph.py | 4 ++-- projects/xubuntu_releases.py | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/projects/linuxmint.py b/projects/linuxmint.py index 3ff37c6..653883b 100644 --- a/projects/linuxmint.py +++ b/projects/linuxmint.py @@ -51,7 +51,7 @@ class linuxmint(Project): cls.scrape(compare, folders, site1, site2, dir_next) @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists compare=[] @@ -63,4 +63,4 @@ class linuxmint(Project): # calling function cls.scrape(compare, folders, upstream_url, csc_url, "") - return all(compare) \ No newline at end of file + return all(compare) diff --git a/projects/linuxmint_packages.py b/projects/linuxmint_packages.py index f69ca83..b3f57e0 100644 --- a/projects/linuxmint_packages.py +++ b/projects/linuxmint_packages.py @@ -31,7 +31,7 @@ class linuxmint_packages(Project): # print(site_next) @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists urls1=[] @@ -52,4 +52,4 @@ class linuxmint_packages(Project): if requests.get(f).text != requests.get(urls2[index]).text: # comparing the file content bc that's how the base class does it, but we can speed it up by just comparing the dates return False - return True \ No newline at end of file + return True diff --git a/projects/macports.py b/projects/macports.py index fe1aaaa..4bd3184 100644 --- a/projects/macports.py +++ b/projects/macports.py @@ -28,7 +28,7 @@ class macports(Project): return matches[0] @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" csc_url = CSC_MIRROR + data[project]["csc"] upstream_url = data[project]["upstream"] diff --git a/projects/mxlinux_iso.py b/projects/mxlinux_iso.py index dcd0fff..59de585 100644 --- a/projects/mxlinux_iso.py +++ b/projects/mxlinux_iso.py @@ -50,7 +50,7 @@ class mxlinux_iso(Project): return True @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" csc_url = CSC_MIRROR + data[project]["csc"] + data[project]["file"] @@ -59,4 +59,4 @@ class mxlinux_iso(Project): # print(cls.check_iso(upstream_url+"slackware-iso/", csc_url+"slackware-iso/")) mirrors = data[project]["mirrors"] - return cls.check_iso(csc_url, mirrors) \ No newline at end of file + return cls.check_iso(csc_url, mirrors) diff --git a/projects/netbsd.py b/projects/netbsd.py index d90cd6b..df17056 100644 --- a/projects/netbsd.py +++ b/projects/netbsd.py @@ -80,7 +80,7 @@ class netbsd(Project): @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" csc_url = CSC_MIRROR + data[project]["csc"] + data[project]["file"] @@ -88,4 +88,4 @@ class netbsd(Project): # print(cls.check_version(upstream_url, csc_url)) # print(cls.check_iso(upstream_url+"iso/", csc_url+"iso/")) - return cls.check_version(upstream_url, csc_url) and cls.check_iso(upstream_url+"iso/", csc_url+"iso/") \ No newline at end of file + return cls.check_version(upstream_url, csc_url) and cls.check_iso(upstream_url+"iso/", csc_url+"iso/") diff --git a/projects/opensuse.py b/projects/opensuse.py index 6fe4522..d97c4b8 100644 --- a/projects/opensuse.py +++ b/projects/opensuse.py @@ -51,7 +51,7 @@ class opensuse(Project): cls.scrape(compare, folders, site1, site2, dir_next) @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists compare=[] @@ -63,4 +63,4 @@ class opensuse(Project): # calling function cls.scrape(compare, folders, upstream_url, csc_url, "") - return all(compare) \ No newline at end of file + return all(compare) diff --git a/projects/puppy_linux.py b/projects/puppy_linux.py index 0a183c5..e644100 100644 --- a/projects/puppy_linux.py +++ b/projects/puppy_linux.py @@ -64,7 +64,7 @@ class puppy_linux(Project): @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists compare=[] @@ -76,4 +76,4 @@ class puppy_linux(Project): # calling function cls.scrape(compare, folders, upstream_url, csc_url, "") - return all(compare) \ No newline at end of file + return all(compare) diff --git a/projects/racket.py b/projects/racket.py index 0eb45a8..8d201b7 100644 --- a/projects/racket.py +++ b/projects/racket.py @@ -66,9 +66,9 @@ class racket(Project): @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" csc_url = CSC_MIRROR + data[project]["csc"] + data[project]["file"] upstream_url = data[project]["upstream"] + data[project]["file"] - return cls.get_latest_version(csc_url) == cls.get_latest_version(upstream_url) \ No newline at end of file + return cls.get_latest_version(csc_url) == cls.get_latest_version(upstream_url) diff --git a/projects/raspberrypi.py b/projects/raspberrypi.py index 5fe18ac..f88953d 100644 --- a/projects/raspberrypi.py +++ b/projects/raspberrypi.py @@ -31,7 +31,7 @@ class raspberrypi(Project): # print(site_next) @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists urls1=[] @@ -52,4 +52,4 @@ class raspberrypi(Project): if requests.get(f).text != requests.get(urls2[index]).text: # comparing the file content bc that's how the base class does it, but we can speed it up by just comparing the dates return False - return True \ No newline at end of file + return True diff --git a/projects/sage.py b/projects/sage.py index 3466376..d5ade4a 100644 --- a/projects/sage.py +++ b/projects/sage.py @@ -15,7 +15,7 @@ class sage(Project): return max(dates) @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): page1 = requests.get(CSC_MIRROR + data[project]["csc"] + data[project]["file"]).text page2 = requests.get("http://mirrors.mit.edu/sage/src/index.html").text page3 = requests.get("https://mirror.rcg.sfu.ca/mirror/sage/src/index.html").text diff --git a/projects/slackware.py b/projects/slackware.py index 8730f56..02a0549 100644 --- a/projects/slackware.py +++ b/projects/slackware.py @@ -63,7 +63,7 @@ class slackware(Project): return True @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" csc_url = CSC_MIRROR + data[project]["csc"] + data[project]["file"] @@ -71,4 +71,4 @@ class slackware(Project): # print(cls.check_iso(upstream_url+"slackware-iso/", csc_url+"slackware-iso/")) - return cls.scrape(upstream_url, csc_url) and cls.check_iso(upstream_url+"slackware-iso/", csc_url+"slackware-iso/") \ No newline at end of file + return cls.scrape(upstream_url, csc_url) and cls.check_iso(upstream_url+"slackware-iso/", csc_url+"slackware-iso/") diff --git a/projects/trisquel.py b/projects/trisquel.py index 2d56690..40d6faa 100644 --- a/projects/trisquel.py +++ b/projects/trisquel.py @@ -55,7 +55,7 @@ class trisquel(Project): return True @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" csc_url = CSC_MIRROR + data[project]["csc"] + data[project]["file"] @@ -64,4 +64,4 @@ class trisquel(Project): # print(cls.check_iso(upstream_url+"slackware-iso/", csc_url+"slackware-iso/")) mirrors = data[project]["mirrors"] - return cls.scrape(upstream_url, csc_url+"packages/dists/") and cls.check_iso(csc_url+"iso/", mirrors) \ No newline at end of file + return cls.scrape(upstream_url, csc_url+"packages/dists/") and cls.check_iso(csc_url+"iso/", mirrors) diff --git a/projects/ubuntu_ports.py b/projects/ubuntu_ports.py index 3c76c0f..fcbaef5 100644 --- a/projects/ubuntu_ports.py +++ b/projects/ubuntu_ports.py @@ -29,11 +29,11 @@ class ubuntu_ports(Project): return True @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" csc_url = CSC_MIRROR + data[project]["csc"] + data[project]["file"] upstream_url = data[project]["upstream"] + data[project]["file"] # calling function - return cls.scrape(upstream_url, csc_url) \ No newline at end of file + return cls.scrape(upstream_url, csc_url) diff --git a/projects/ubuntu_ports_releases.py b/projects/ubuntu_ports_releases.py index 49de202..e33eea2 100644 --- a/projects/ubuntu_ports_releases.py +++ b/projects/ubuntu_ports_releases.py @@ -61,7 +61,7 @@ class ubuntu_ports_releases(Project): cls.scrape(compare, folders, site1, site2, dir_next) @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists compare=[] @@ -73,4 +73,4 @@ class ubuntu_ports_releases(Project): # calling function cls.scrape(compare, folders, upstream_url, csc_url, "") - return all(compare) \ No newline at end of file + return all(compare) diff --git a/projects/x_org.py b/projects/x_org.py index 135e7a2..4659417 100644 --- a/projects/x_org.py +++ b/projects/x_org.py @@ -30,7 +30,7 @@ class x_org(Project): @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists files1=[] @@ -45,4 +45,4 @@ class x_org(Project): # print(set(files1) - set(files2)) - return set(files1) == set(files2) \ No newline at end of file + return set(files1) == set(files2) diff --git a/projects/xiph.py b/projects/xiph.py index 0b2f9e7..2986eaf 100644 --- a/projects/xiph.py +++ b/projects/xiph.py @@ -80,7 +80,7 @@ class xiph(Project): @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists releases1=[] @@ -96,4 +96,4 @@ class xiph(Project): if set(releases1) != set(releases2): return False - return cls.check_mirror(csc_url, upstream_url, releases2) \ No newline at end of file + return cls.check_mirror(csc_url, upstream_url, releases2) diff --git a/projects/xubuntu_releases.py b/projects/xubuntu_releases.py index 4d134b3..6d77e14 100644 --- a/projects/xubuntu_releases.py +++ b/projects/xubuntu_releases.py @@ -61,7 +61,7 @@ class xubuntu_releases(Project): cls.scrape(compare, folders, site1, site2, dir_next) @classmethod - def check(cls, data, project): + def check(cls, data, project, current_time): """Check if project packages are up-to-date""" # lists compare=[] @@ -73,4 +73,4 @@ class xubuntu_releases(Project): # calling function cls.scrape(compare, folders, upstream_url, csc_url, "") - return all(compare) \ No newline at end of file + return all(compare)