diff --git a/Use-threads-submodule-in-favor-of-compatibily-file-threading.patch b/Use-threads-submodule-in-favor-of-compatibily-file-threading.patch new file mode 100644 index 0000000000000000000000000000000000000000..25b9506c681c40225a0347c556c55b21df475f9a --- /dev/null +++ b/Use-threads-submodule-in-favor-of-compatibily-file-threading.patch @@ -0,0 +1,25 @@ +diff -apurN initial-setup-r0.3.100-1/initial_setup/tui/tui.py initial-setup-r0.3.100-1-new/initial_setup/tui/tui.py +--- initial-setup-r0.3.100-1/initial_setup/tui/tui.py 2024-01-04 01:31:16.000000000 +0800 ++++ initial-setup-r0.3.100-1-new/initial_setup/tui/tui.py 2024-06-17 14:14:19.264596900 +0800 +@@ -1,5 +1,5 @@ + from pyanaconda.ui.tui import TextUserInterface +-from pyanaconda import threading ++from pyanaconda.core.threads import thread_manager + + from initial_setup.product import get_product_title, is_final + from initial_setup.common import list_usable_consoles_for_tui, get_quit_message +@@ -283,10 +283,10 @@ class InitialSetupTextUserInterface(Text + self.multi_tty_handler = MultipleTTYHandler(tui_stdin_fd=tui_stdin_fd, + tui_stdout_fd=tui_stdout_fd) + # start the multi-tty handler +- threading.threadMgr.add( +- threading.AnacondaThread(name="initial_setup_multi_tty_thread", +- target=self.multi_tty_handler.run) +- ) ++ thread_manager.add_thread( ++ name="initial_setup_multi_tty_thread", ++ target=self.multi_tty_handler.run) ++ + + def setup(self, data): + TextUserInterface.setup(self, data) diff --git a/initial-setup.spec b/initial-setup.spec index 89a97873bbb5e8aad6b40de462900dd78b9779a3..45ab9d327402ed7ada2b5f4fa5388e21393add90 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,12 +1,14 @@ Name: initial-setup Version: 0.3.100 -Release: 1 +Release: 2 Summary: Initialize system configuration for a newly installed computer License: GPLv2+ URL: https://github.com/rhinstaller/initial-setup Source0: https://github.com/rhinstaller/initial-setup/archive/r%{version}-1.tar.gz Source1: anaconda-template.json +Patch9001: Use-threads-submodule-in-favor-of-compatibily-file-threading.patch + %define debug_package %{nil} BuildRequires: gettext python3-devel python3-setuptools systemd-units @@ -74,6 +76,9 @@ rm -rf %{buildroot} %exclude %{_defaultdocdir}/%{name}/ChangeLog %changelog +* Mon Jun 17 2024 guojunding - 0.3.100-2 +- Use threads.py submodule in favor of compatibily file threading.py + * Tue Apr 30 2024 yaoxin - 0.3.100-1 - Upgrade to 0.3.100