spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-06 21:44:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

[arch] fix -> AUR: not checking updates correctly when there are epoch numbers present

Browse Source
This commit is contained in:
Vinicius Moreira
2020-09-02 11:10:50 -03:00
parent a0d960aa4b
commit fb2c062226
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bauh/gems/arch/mapper.py
View File

@@ -49,6 +49,20 @@ class ArchDataMapper:
def check_update(version: str, latest_version: str) -> bool:
if version and latest_version:
try:
ver_epoch, latest_epoch = version.split(':'), latest_version.split(':')
if len(ver_epoch) > 1 and len(latest_epoch) > 1:
parsed_ver_epoch, parsed_latest_epoch = parse_version(ver_epoch[0]), parse_version(latest_epoch[0])
if parsed_ver_epoch == parsed_latest_epoch:
return parse_version(''.join(ver_epoch[1:])) < parse_version(''.join(latest_epoch[1:]))
else:
return parsed_ver_epoch < parsed_latest_epoch
elif len(ver_epoch) > 1 and len(latest_epoch) == 1:
return False
elif len(ver_epoch) == 1 and len(latest_epoch) > 1:
return True
else:
return parse_version(version) < parse_version(latest_version)
except:
print('{}Version: {}. Latest version: {}{}'.format(Fore.RED, version, latest_version, Fore.RESET))

15
tests/gems/arch/test_arch_data_mapper.py
View File

@@ -28,3 +28,18 @@ class ArchDataMapperTest(TestCase):
self.assertTrue(ArchDataMapper.check_update('0.9.7.RC-9', '0.9.7.RC-10'))
self.assertFalse(ArchDataMapper.check_update('1.1.0.r11.caacf30-1', 'r65.4c7144a-1'))
self.assertFalse(ArchDataMapper.check_update('1.2.16.r688.8b2c199-1', 'r2105.e91f0e9-3'))
def test_check_update__versions_with_epics(self):
self.assertTrue(ArchDataMapper.check_update('1.2-1', '1:1.1-1'))
self.assertFalse(ArchDataMapper.check_update('1:1.1-1', '1.2-1'))
self.assertTrue(ArchDataMapper.check_update('1:1.2-1', '2:0.1-1'))
self.assertFalse(ArchDataMapper.check_update('2:0.1-1', '1:1.2-1'))
self.assertTrue(ArchDataMapper.check_update('10:1.1-1', '10:1.2-1'))
self.assertFalse(ArchDataMapper.check_update('10:1.2-1', '10:1.2-1'))
self.assertTrue(ArchDataMapper.check_update('9:1.2-1', '10:0.1-1'))
self.assertTrue(ArchDataMapper.check_update('9:1.1.1.1-2', '10:0.0'))
self.assertFalse(ArchDataMapper.check_update('10:0.0', '9:1.1.1.1-2'))