diff --git a/ChangeLog.txt b/ChangeLog.txt index 456376db..63039f66 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +4.2.7 - 05/11/2022 +Fixed: +- Switch to check ChangeLogs.txt files by size + 4.2.6 - 03/11/2022 Fixed: - Check for the file ChangeLog.txt diff --git a/README.rst b/README.rst index 6aaca32a..1477ca9b 100644 --- a/README.rst +++ b/README.rst @@ -30,8 +30,8 @@ Install from the official third-party `SBo repository =1.4.36 PyYAML>=6.0 - diff --git a/setup.cfg b/setup.cfg index 166f87e1..8d41c2ad 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = slpkg -version = 4.2.6 +version = 4.2.7 license_file = LICENSE author = Dimitris Zlatanidis author_email = d.zlatanidis@gmail.com diff --git a/slpkg/check_updates.py b/slpkg/check_updates.py index 1b267544..fe34bffc 100644 --- a/slpkg/check_updates.py +++ b/slpkg/check_updates.py @@ -17,20 +17,19 @@ class CheckUpdates: def updates(self): - local_date = '' + local_date = 0 local_chg_txt = f'{self.sbo_repo_path}/{self.chglog_txt}' - if os.path.isfile(local_chg_txt): - with open(local_chg_txt, 'r', encoding='utf-8') as f: - local_date = f.readline().strip() - http = urllib3.PoolManager() repo = http.request( 'GET', f'{self.sbo_repo_url}/{self.chglog_txt}') - repo_date = repo.data.decode().split('\\')[0][:len(local_date)].strip() + if os.path.isfile(local_chg_txt): + local_date = int(os.stat(local_chg_txt).st_size) - if repo_date > local_date: + repo_date = int(repo.headers['Content-Length']) + + if repo_date != local_date: print('\nThere are new updates available.\n') else: print('\nNo updated packages since the last check.\n') diff --git a/slpkg/upgrade.py b/slpkg/upgrade.py index a9aa11be..db6547a1 100644 --- a/slpkg/upgrade.py +++ b/slpkg/upgrade.py @@ -25,8 +25,8 @@ class Upgrade: inst_pkg_name = '-'.join(pkg.split('-')[:-3]) if inst_pkg_name in repo_packages: - installed_ver = pkg.replace( - inst_pkg_name + '-', '').split('-')[0] + installed_ver = pkg.replace(f'{inst_pkg_name}-', + '').split('-')[0] repo_ver = SBoQueries(inst_pkg_name).version() if LooseVersion(repo_ver) > LooseVersion(installed_ver): diff --git a/slpkg/version.py b/slpkg/version.py index d1f35810..29c8ba4a 100644 --- a/slpkg/version.py +++ b/slpkg/version.py @@ -10,7 +10,7 @@ from slpkg.configs import Configs @dataclass class Version: prog_name: str = Configs.prog_name - version_info: tuple = (4, 2, 6) + version_info: tuple = (4, 2, 7) version: str = '{0}.{1}.{2}'.format(*version_info) license: str = 'MIT License' author: str = 'dslackw'