[lxc-devel] [distrobuilder/master] definition: Use mapped architecture in name/description

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 362 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180321/c16e3dd3/attachment.bin>
-------------- next part --------------
From b01f0a04163c3075497f0632e5698ee694b7cf2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 21 Mar 2018 14:57:22 -0400
Subject: [PATCH] definition: Use mapped architecture in name/description
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 shared/definition.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/definition.go b/shared/definition.go
index 809982b..023db6a 100644
--- a/shared/definition.go
+++ b/shared/definition.go
@@ -162,11 +162,11 @@ func (d *Definition) SetDefaults() {
 
 	// Set default name and description templates
 	if d.Image.Name == "" {
-		d.Image.Name = "{{ image.distribution }}-{{ image.release }}-{{ image.architecture }}-{{ image.variant }}-{{ image.serial }}"
+		d.Image.Name = "{{ image.distribution }}-{{ image.release }}-{{ image.mapped_architecture }}-{{ image.variant }}-{{ image.serial }}"
 	}
 
 	if d.Image.Description == "" {
-		d.Image.Description = "{{ image.distribution|capfirst }} {{ image.release }} {{ image.architecture }}{% if image.variant != \"default\" %} ({{ image.variant }}){% endif %} ({{ image.serial }})"
+		d.Image.Description = "{{ image.distribution|capfirst }} {{ image.release }} {{ image.mapped_architecture }}{% if image.variant != \"default\" %} ({{ image.variant }}){% endif %} ({{ image.serial }})"
 	}
 }