Skip to content

Commit

Permalink
fix (FSUpdate): fixes FSUpdate version parsing issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Mario Lukas committed Mar 22, 2022
1 parent d61f664 commit f9dbdbd
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/fabscan/lib/util/FSUpdate.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@

def get_build(version):

if semver.VersionInfo.isvalid(version):
if not semver.VersionInfo.isvalid(version):
raise ValueError('%s is not valid SemVer string' % version)

verinfo = semver.VersionInfo.parse(version)

if verinfo['build']:
return verinfo['build']
verinfo = semver.parse_version_info(version)
if verinfo.build:
return verinfo.build
else:
return "0"

Expand Down Expand Up @@ -75,8 +74,9 @@ def get_latest_version_tag():
# ignore invalid version number
pass
break
return latest_version
return latest_version.strip()
except (Exception, urllib.error.URLError) as e:
_logger.error(e)
_logger.exception("Error while getting latest version tag: ")
return __version__

Expand Down Expand Up @@ -114,7 +114,6 @@ def upgrade_is_available(current_version, online_lookup_ip):

return is_upgradeable(latest_version, current_version), latest_version


def do_upgrade():
try:
os.system('nohup bash -c "sudo apt-get update -y && sudo apt-get dist-upgrade -y --only-upgrade -o Dpkg::Options::=\"--force-confnew\" fabscanpi-server" >> /var/log/fabscanpi/upgrade.log')
Expand Down

0 comments on commit f9dbdbd

Please sign in to comment.