From cc38a9928431046739caa10b95490eadd95f318d Mon Sep 17 00:00:00 2001
From: Martin Kolman <mkolman@redhat.com>
Date: Sep 05 2019 18:31:05 +0000
Subject: New version 31.22.3-2


- Don't set up a warning label to None (#1745933) (vponcova)
  Resolves: rhbz#1745933

---

diff --git a/0001-dont-set-warning-label-to-none-1745933.patch b/0001-dont-set-warning-label-to-none-1745933.patch
new file mode 100644
index 0000000..7b5d83a
--- /dev/null
+++ b/0001-dont-set-warning-label-to-none-1745933.patch
@@ -0,0 +1,25 @@
+From b7a1df23b82bf5e3aca048822f79a1d5aab3e32d Mon Sep 17 00:00:00 2001
+From: Vendula Poncova <vponcova@redhat.com>
+Date: Tue, 27 Aug 2019 13:36:35 +0200
+Subject: [PATCH] Don't set up a warning label to None (#1745933)
+
+If the error is None, set the warning label to an empty string.
+
+Resolves: rhbz#1745933
+---
+ pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
+index 0c6b391cf6..62caeaa236 100644
+--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
++++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
+@@ -277,7 +277,7 @@ def on_add_confirm_clicked(self, button, *args):
+         else:
+             self._error = validate_mount_point(self.mount_point, self.mount_points)
+ 
+-        self._warningLabel.set_text(self._error)
++        self._warningLabel.set_text(self._error or "")
+         self.window.show_all()
+         if self._error:
+             return
diff --git a/anaconda.spec b/anaconda.spec
index f3066c6..4769cd5 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -5,7 +5,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 31.22.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -16,6 +16,9 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
+# Fix a F31 Beta blocker - https://bugzilla.redhat.com/show_bug.cgi?id=1745933
+Patch1: 0001-dont-set-warning-label-to-none-1745933.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -352,6 +355,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Thu Sep 05 2019 Martin Kolman <mkolman@redhat.com> - 31.22.3-2
+- Don't set up a warning label to None (#1745933) (vponcova)
+  Resolves: rhbz#1745933
+
 * Mon Aug 26 2019 Martin Kolman <mkolman@redhat.com> - 31.22.3-1
 - Use the task container to publish tasks (vponcova)
 - Remove publish_task (vponcova)