From d60e4bd9b49c95e7addaceb429d375ba535de4bc Mon Sep 17 00:00:00 2001 From: Carl George Date: Aug 12 2020 22:52:29 +0000 Subject: Rebase patch104 on current version --- diff --git a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch index 6916923..687f3a4 100644 --- a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch +++ b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch @@ -1,12 +1,12 @@ -From 23a454ea25a684c6de9a62b51f014a488eba29a3 Mon Sep 17 00:00:00 2001 +From 4dd22c6aad986c49c313999332c3791d581a1e92 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Thu, 25 Jun 2020 18:10:13 -0500 Subject: [PATCH] Add product data for CentOS Stream --- data/product.d/centos-stream.conf | 7 +++++++ - tests/nosetests/pyanaconda_tests/product_test.py | 5 +++++ - 2 files changed, 12 insertions(+) + tests/nosetests/pyanaconda_tests/product_test.py | 4 ++++ + 2 files changed, 11 insertions(+) create mode 100644 data/product.d/centos-stream.conf diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf @@ -23,21 +23,20 @@ index 000000000..c65fcbbdf +[Base Product] +product_name = CentOS Linux diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py -index 90b8ad60a..3f2224a69 100644 +index f2203f431..5967141bc 100644 --- a/tests/nosetests/pyanaconda_tests/product_test.py +++ b/tests/nosetests/pyanaconda_tests/product_test.py -@@ -235,6 +235,11 @@ class ProductConfigurationTestCase(unittest.TestCase): - ["rhel.conf", "centos.conf"], - WORKSTATION_PARTITIONING +@@ -118,6 +118,10 @@ class ProductConfigurationTestCase(unittest.TestCase): + "CentOS Linux", "", + ["rhel.conf", "centos.conf"] ) + self._check_default_product( + "CentOS Stream", "", -+ ["rhel.conf", "centos.conf", "centos-stream.conf"], -+ WORKSTATION_PARTITIONING ++ ["rhel.conf", "centos.conf", "centos-stream.conf"] + ) self._check_default_product( "Red Hat Virtualization", "", - ["rhel.conf", "rhev.conf"], + ["rhel.conf", "rhev.conf"] -- 2.26.2