From 282bae32aa8a8506540a613b250f891f6cb54ef8 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Sun, 28 Apr 2019 08:27:08 -0400
Subject: [PATCH] Fix openSUSE Tumbleweed DistTag definition

The DistTag macro definition for openSUSE Tumbleweed was slightly
incorrect, and did not correctly retrieve the VERSION_ID from the
os-release(5) file due to how shell expansion works.

This should be fixed now.
---
 mock-core-configs/etc/mock/opensuse-tumbleweed-aarch64.cfg | 2 +-
 mock-core-configs/etc/mock/opensuse-tumbleweed-i586.cfg    | 2 +-
 mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64.cfg   | 2 +-
 mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64le.cfg | 2 +-
 mock-core-configs/etc/mock/opensuse-tumbleweed-x86_64.cfg  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mock-core-configs/etc/mock/opensuse-tumbleweed-aarch64.cfg b/mock-core-configs/etc/mock/opensuse-tumbleweed-aarch64.cfg
index 7ae1acba..79e09a88 100644
--- a/mock-core-configs/etc/mock/opensuse-tumbleweed-aarch64.cfg
+++ b/mock-core-configs/etc/mock/opensuse-tumbleweed-aarch64.cfg
@@ -6,7 +6,7 @@ config_opts['dist'] = 'tumbleweed'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
 config_opts['releasever'] = '0'
-config_opts['macros']['%dist'] = '.suse.tw%(. /etc/os-release; echo $VERSION_ID)'
+config_opts['macros']['%dist'] = '.suse.tw%(sh -c ". /etc/os-release; echo \$VERSION_ID")'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
diff --git a/mock-core-configs/etc/mock/opensuse-tumbleweed-i586.cfg b/mock-core-configs/etc/mock/opensuse-tumbleweed-i586.cfg
index 8fc6a162..8d78ac0d 100644
--- a/mock-core-configs/etc/mock/opensuse-tumbleweed-i586.cfg
+++ b/mock-core-configs/etc/mock/opensuse-tumbleweed-i586.cfg
@@ -6,7 +6,7 @@ config_opts['dist'] = 'tumbleweed'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
 config_opts['releasever'] = '0'
-config_opts['macros']['%dist'] = '.suse.tw%(. /etc/os-release; echo $VERSION_ID)'
+config_opts['macros']['%dist'] = '.suse.tw%(sh -c ". /etc/os-release; echo \$VERSION_ID")'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
diff --git a/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64.cfg b/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64.cfg
index b46563ac..5b877049 100644
--- a/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64.cfg
+++ b/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64.cfg
@@ -6,7 +6,7 @@ config_opts['dist'] = 'tumbleweed'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
 config_opts['releasever'] = '0'
-config_opts['macros']['%dist'] = '.suse.tw%(. /etc/os-release; echo $VERSION_ID)'
+config_opts['macros']['%dist'] = '.suse.tw%(sh -c ". /etc/os-release; echo \$VERSION_ID")'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
diff --git a/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64le.cfg b/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64le.cfg
index 3b857ab7..4c262a76 100644
--- a/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64le.cfg
+++ b/mock-core-configs/etc/mock/opensuse-tumbleweed-ppc64le.cfg
@@ -6,7 +6,7 @@ config_opts['dist'] = 'tumbleweed'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
 config_opts['releasever'] = '0'
-config_opts['macros']['%dist'] = '.suse.tw%(. /etc/os-release; echo $VERSION_ID)'
+config_opts['macros']['%dist'] = '.suse.tw%(sh -c ". /etc/os-release; echo \$VERSION_ID")'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
diff --git a/mock-core-configs/etc/mock/opensuse-tumbleweed-x86_64.cfg b/mock-core-configs/etc/mock/opensuse-tumbleweed-x86_64.cfg
index e092f837..b77cab84 100644
--- a/mock-core-configs/etc/mock/opensuse-tumbleweed-x86_64.cfg
+++ b/mock-core-configs/etc/mock/opensuse-tumbleweed-x86_64.cfg
@@ -6,7 +6,7 @@ config_opts['dist'] = 'tumbleweed'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
 config_opts['releasever'] = '0'
-config_opts['macros']['%dist'] = '.suse.tw%(. /etc/os-release; echo $VERSION_ID)'
+config_opts['macros']['%dist'] = '.suse.tw%(sh -c ". /etc/os-release; echo \$VERSION_ID")'
 config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
-- 
2.13.7