[lxc-devel] [distrobuilder/master] definition: Remove default for source.Variant

monstermunchkin on Github lxc-bot at linuxcontainers.org
Thu Mar 8 15:19:54 UTC 2018


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 363 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180308/672d7853/attachment.bin>
-------------- next part --------------
From 5183b20b7852d9a9e8781730400d43f4f73d127c Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Thu, 8 Mar 2018 16:19:20 +0100
Subject: [PATCH] definition: Remove default for source.Variant

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 shared/definition.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/shared/definition.go b/shared/definition.go
index 3f8419e..7e60657 100644
--- a/shared/definition.go
+++ b/shared/definition.go
@@ -112,11 +112,6 @@ func SetDefinitionDefaults(def *Definition) {
 	if def.Source.Keyserver == "" {
 		def.Source.Keyserver = "hkps.pool.sks-keyservers.net"
 	}
-
-	// If no Source.Variant is specified, use the one in Image.Variant.
-	if def.Source.Variant == "" {
-		def.Source.Variant = def.Image.Variant
-	}
 }
 
 // ValidateDefinition validates the given Definition.


More information about the lxc-devel mailing list