diff --git a/installsystems/image.py b/installsystems/image.py index 6b1f008cdd633b8346f233fb2d2fdb44200d189d..92b660425aa47c19cbbefcf90f370e6b590acdae 100644 --- a/installsystems/image.py +++ b/installsystems/image.py @@ -513,7 +513,7 @@ class PackageImage(Image): # print info arrow("Image %s v%s loaded" % (self.name, self.version)) arrow("Author: %s" % self.author, 1) - arrow("Date: %s" % time.ctime(self.date), 1) + arrow("Date: %s" % istools.time_rfc2822(self.date), 1) # build payloads info self.payload = {} for pname, pval in self._metadata["payload"].items(): @@ -587,7 +587,7 @@ class PackageImage(Image): ''' out('#light##yellow#Name:#reset# %s' % self.name) out('#light##yellow#Version:#reset# %s' % self.version) - out('#yellow#Date:#reset# %s' % time.ctime(self.date)) + out('#yellow#Date:#reset# %s' % istools.time_rfc2822(self.date)) out('#yellow#Description:#reset# %s' % self.description) out('#yellow#Author:#reset# %s' % self.author) if verbose: @@ -603,7 +603,7 @@ class PackageImage(Image): for payload_name in payloads: payload = payloads[payload_name] out('#light##yellow#Payload:#reset# %s' % payload_name) - out(' #yellow#Date:#reset# %s' % time.ctime(payload.mtime)) + out(' #yellow#Date:#reset# %s' % istools.rfc2822(payload.mtime)) out(' #yellow#Size:#reset# %s' % (istools.human_size(payload.size))) out(' #yellow#MD5:#reset# %s' % payload.md5) # display image content diff --git a/installsystems/repository.py b/installsystems/repository.py index d1811bcabb0c5f7ed0ea7bfef3721693f691b3da..fdda664d3e15f801dae61fbce5e7a977ac50fbf9 100644 --- a/installsystems/repository.py +++ b/installsystems/repository.py @@ -339,7 +339,7 @@ class Repository(object): image_description, image_size) in images: out("#light##yellow#%s #reset#v%s" % (image_name, image_version)) if verbose: - out(" #yellow#Date:#reset# %s" % time.ctime(image_date)) + out(" #yellow#Date:#reset# %s" % istools.time_rfc2822(image_date)) out(" #yellow#Description:#reset# %s" % image_description) out(" #yellow#Author:#reset# %s" % image_author) out(" #yellow#MD5:#reset# %s" % image_md5) diff --git a/installsystems/tools.py b/installsystems/tools.py index 5394a0d3c9db96e2d70c49498ba70c0f0cc9f061..ebcf11aa30e38506c562f32bff2410c5f5cad5e8 100644 --- a/installsystems/tools.py +++ b/installsystems/tools.py @@ -337,6 +337,12 @@ def human_size(num, unit='B'): scaled = num / float(1024 ** power) return "%3.1f%s%s" % (scaled, prefixes[power], unit) +def time_rfc2822(timestamp): + ''' + Return a rfc2822 format time string from an unix timestamp + ''' + return time.strftime("%a, %d %b %Y %H:%M:%S %z", time.gmtime(timestamp)) + def guess_distro(path): ''' Try to detect which distro is inside a directory