projectatomic/atomic
1
0
Fork 0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-06 12:45:57 +01:00
Code Issues Releases Activity

Correct blank version names

Browse Source 
Due to a bug in atomic verify, sometimes the local and remote
versions ended up being blank.
This commit is contained in:
Brent Baude
2015-12-18 13:36:10 -06:00
parent a3d025cc1a
commit 3331c19094
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Atomic/verify.py
View File

@@ -69,6 +69,7 @@ class Verify(Atomic):
local_nvr = latest_version = _match['Version']
remote = True
else:
local_nvr = self.get_local_latest_version(name)
latest_version = self.get_latest_remote_version(_match['Tag'])
no_version = (latest_version == "")
@@ -197,6 +198,8 @@ class Verify(Atomic):
str(_max_name) + "} {1:" + \
str(_max_name) + "} {2:1}"
util.writeOut("\n{} contains the following images:\n".format(image))
util.writeOut(three_col.format("Local Version", "Latest Version", ""))
util.writeOut(three_col.format("-------------", "--------------", ""))
for _image in base_images:
local = _image['local_nvr']
latest = _image['latest_nvr']
@@ -245,6 +248,7 @@ class Verify(Atomic):
return self.assemble_nvr(image)
else:
continue
return "Version unavailable"
def get_latest_remote_version(self, tag):
r_inspect = self.d.remote_inspect(tag)
@@ -261,10 +265,16 @@ class Verify(Atomic):
:param image:
:return: str
"""
nvr = "%s-%s-%s" % (self.pull_label(image, 'Name'),
self.pull_label(image, 'Version'),
self.pull_label(image, 'Release'))
return nvr
name = self.pull_label(image, 'Name')
version = self.pull_label(image, 'Version')
release = self.pull_label(image, 'Release')
nvr = "%s-%s-%s" % (name, version, release)
if any(True for x in [name, version, release] if x is None):
return "Version unavailable"
else:
return nvr
@staticmethod
def get_local_version(name, layers):