From 3758f97ccd03d6b62c647bf2538a547a961d771c Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Wed, 10 Apr 2019 19:35:22 -0500 Subject: [PATCH] Restore button updates in partition page. Summary: Restore the button update status matches the current state. This resolves T40 lp:#1823569 Test Plan: Verify in manual partitioning that the buttons are updated properly. Reviewers: tsimonq2, wxl Reviewed By: wxl Maniphest Tasks: T40 Differential Revision: https://phab.lubuntu.me/D3 --- debian/changelog | 6 ++++++ debian/patches/series | 1 + debian/patches/update-buttons.patch | 16 ++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 debian/patches/update-buttons.patch diff --git a/debian/changelog b/debian/changelog index ba0b431..08b7515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.4-0ubuntu2) disco; urgency=medium + + * Restore button updates in partition page (LP: #1823569). + + -- Dan Simmons Mon, 08 Apr 2019 07:18:07 -0400 + calamares (3.2.4-0ubuntu1) disco; urgency=medium * New upstream release. diff --git a/debian/patches/series b/debian/patches/series index 683ca99..4cfd2cd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch +update-buttons.patch diff --git a/debian/patches/update-buttons.patch b/debian/patches/update-buttons.patch new file mode 100644 index 0000000..6de2bd5 --- /dev/null +++ b/debian/patches/update-buttons.patch @@ -0,0 +1,16 @@ +Description: Restore button updates in partition module +Author: Adriaan de Groot +Bug: https://github.com/calamares/calamares/issues/1097 +Applied-Upstream: https://github.com/calamares/calamares/commit/2b149fb944da8d975c05d562ab55adaa9dec25bb +Last-Update: 2019-04-08 +--- a/src/modules/partition/gui/PartitionPage.cpp ++++ b/src/modules/partition/gui/PartitionPage.cpp +@@ -581,7 +581,7 @@ void + PartitionPage::onPartitionModelReset() + { + m_ui->partitionTreeView->expandAll(); +- // updateButtons(); ++ updateButtons(); + updateBootLoaderIndex(); + } +