From 3f1b799a858a9262cb72b4fb3f27cc1176a0feb6 Mon Sep 17 00:00:00 2001
From: xiaqirong <xiaqirong1@huawei.com>
Date: Thu, 24 Sep 2020 14:54:57 +0800
Subject: [PATCH] bugfix custom partition failed in disk that exists filesystem

---
 anaconda.spec                                 |  9 ++++-
 ...ailed-in-disk-that-exists-filesystem.patch | 40 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 bugfix-custom-partition-failed-in-disk-that-exists-filesystem.patch

diff --git a/anaconda.spec b/anaconda.spec
index 0743ca8..3852d83 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
 %define _empty_manifest_terminate_build 0
 Name:    anaconda
 Version: 33.19
-Release: 9
+Release: 10
 Summary: Graphical system installer
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -32,6 +32,7 @@ Patch9019:    bugfix-move-verify-valid-installtree-to-source-module-utils.patch
 Patch9020:    bugfix-add-tests-for-verify-valid-installtree-function.patch
 Patch9021:    bugfix-rename-function-for-a-simple-check-for-DNF-repository.patch
 Patch9022:    disable-disk-encryption.patch
+Patch9023:    bugfix-custom-partition-failed-in-disk-that-exists-filesystem.patch
 
 Patch6001:    anaconda-Fix-stage2-as-default-sources.patch
 Patch6002:    anaconda-Allow-to-detect-devices-with-the-iso9660-file-system.patch
@@ -246,6 +247,12 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Sep 24 2020 xiaqirong <xiaqirong1@huawei.com> - 33.19-10
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:custom partition failed in disk that exists filesystem
+
 * Tue Sep 15 2020 xiaqirong <xiaqirong1@huawei.com> - 33.19-9
 - Type:bugfix
 - ID:NA
diff --git a/bugfix-custom-partition-failed-in-disk-that-exists-filesystem.patch b/bugfix-custom-partition-failed-in-disk-that-exists-filesystem.patch
new file mode 100644
index 0000000..86f1658
--- /dev/null
+++ b/bugfix-custom-partition-failed-in-disk-that-exists-filesystem.patch
@@ -0,0 +1,40 @@
+From 4c898e855a73bbd210d7e7eec6cf246cb79f59cc Mon Sep 17 00:00:00 2001
+From: xiaqirong <xiaqirong1@huawei.com>
+Date: Wed, 23 Sep 2020 17:32:55 +0800
+Subject: [PATCH]
+bugfix-custom-partition-failed-in-disk-that-exists-filesystem
+
+---
+ pyanaconda/modules/storage/partitioning/interactive/utils.py | 2 ++
+ pyanaconda/ui/gui/spokes/custom_storage.py                   | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyanaconda/modules/storage/partitioning/interactive/utils.py b/pyanaconda/modules/storage/partitioning/interactive/utils.py
+index b52876a..186978c 100644
+--- a/pyanaconda/modules/storage/partitioning/interactive/utils.py
++++ b/pyanaconda/modules/storage/partitioning/interactive/utils.py
+@@ -1054,6 +1054,8 @@ def _destroy_device(storage, device):
+         # lvm snapshot origins and btrfs subvolumes that contain
+         # other subvolumes.
+         storage.recursive_remove(device)
++    elif device.is_disk:
++        storage.recursive_remove(device)
+     else:
+         storage.destroy_device(device)
+ 
+diff --git a/pyanaconda/ui/gui/spokes/custom_storage.py b/pyanaconda/ui/gui/spokes/custom_storage.py
+index d72e315..448e97e 100644
+--- a/pyanaconda/ui/gui/spokes/custom_storage.py
++++ b/pyanaconda/ui/gui/spokes/custom_storage.py
+@@ -1083,7 +1083,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageCheckHandler):
+         sync_run_task(task_proxy)
+ 
+         # Refresh UI.
+-        self._do_refresh()
++        self.refresh()
+ 
+     def _remove_selected_devices(self):
+         option_checked = False
+-- 
+2.23.0
+
-- 
Gitee