diff --git a/.gitignore b/.gitignore index d793f76..eb8c5ef 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /blivet-gui-2.2.0.tar.gz /blivet-gui-2.2.1.tar.gz /blivet-gui-2.3.0.tar.gz +/blivet-gui-2.4.0.tar.gz diff --git a/0001-Do-not-allow-setting-chunk-size-for-RAID1.patch b/0001-Do-not-allow-setting-chunk-size-for-RAID1.patch deleted file mode 100644 index bab0aec..0000000 --- a/0001-Do-not-allow-setting-chunk-size-for-RAID1.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 6e34d491e5f930af42a407bd3ef9d16553bf7ee4 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Mon, 23 Aug 2021 15:14:49 +0200 -Subject: [PATCH 1/2] pylint: Ignore false positive assignment-from-no-return - warning - ---- - blivetgui/communication/proxy_utils.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivetgui/communication/proxy_utils.py b/blivetgui/communication/proxy_utils.py -index 4888e2b..ec822e4 100644 ---- a/blivetgui/communication/proxy_utils.py -+++ b/blivetgui/communication/proxy_utils.py -@@ -59,7 +59,7 @@ class ProxyID(object): - _newid_gen = functools.partial(next, itertools.count()) - - def __init__(self): -- self.id = self._newid_gen() -+ self.id = self._newid_gen() # pylint: disable=assignment-from-no-return - - def __repr__(self): - return "'Proxy ID, %s'" % self.id - -From dec1f8d481c19eeed91b6f740cdcbcb9487daf21 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Mon, 23 Aug 2021 15:15:16 +0200 -Subject: [PATCH 2/2] Do not allow setting chunk size for RAID 1 (#1996223) - -RAID 1 doesn't support chunk size, we shouldn't allow to set it in -the UI and also stop to set the default 512 KiB. See also -https://github.com/storaged-project/blivet/pull/969 ---- - blivetgui/blivet_utils.py | 6 +++++- - blivetgui/dialogs/add_dialog.py | 15 ++++++++++++--- - tests/blivetgui_tests/add_dialog_test.py | 12 ++++++++++++ - 3 files changed, 29 insertions(+), 4 deletions(-) - -diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py -index aa2b72f..6fe99a7 100644 ---- a/blivetgui/blivet_utils.py -+++ b/blivetgui/blivet_utils.py -@@ -1209,12 +1209,16 @@ def _create_mdraid(self, user_input): - actions.extend(part_actions) - - md_parents = [ac.device for ac in actions if ac.is_format and ac._format.type == "mdmember"] -+ if user_input.advanced: -+ chunk_size = user_input.advanced["chunk_size"] -+ else: -+ chunk_size = None - new_md = MDRaidArrayDevice(parents=md_parents, - name=device_name, - level=user_input.raid_level, - member_devices=len(md_parents), - total_devices=len(md_parents), -- chunk_size=user_input.advanced["chunk_size"]) -+ chunk_size=chunk_size) - actions.append(blivet.deviceaction.ActionCreateDevice(new_md)) - - if user_input.encrypt: -diff --git a/blivetgui/dialogs/add_dialog.py b/blivetgui/dialogs/add_dialog.py -index 2cb437d..81da95c 100644 ---- a/blivetgui/dialogs/add_dialog.py -+++ b/blivetgui/dialogs/add_dialog.py -@@ -489,6 +489,10 @@ def update_raid_type_chooser(self, keep_selection=False): - def on_raid_type_changed(self, _widget): - self.add_size_area() - -+ if self.selected_type == "mdraid": -+ self.add_advanced_options() -+ self.show_widgets(["advanced"]) -+ - def select_selected_free_region(self): - """ In parent list select the free region user selected checkbox as checked - """ -@@ -859,10 +863,15 @@ def add_advanced_options(self): - self.advanced.destroy() - - if device_type in ("lvm", "lvmvg", "partition", "mdraid"): -- self.advanced = AdvancedOptions(self, device_type, self.selected_parent, self.selected_free) -- self.widgets_dict["advanced"] = [self.advanced] -+ if device_type == "mdraid" and self._raid_chooser.selected_level.name == "raid1": -+ self.advanced = None -+ self.widgets_dict["advanced"] = [] -+ else: -+ self.advanced = AdvancedOptions(self, device_type, self.selected_parent, -+ self.selected_free) -+ self.widgets_dict["advanced"] = [self.advanced] - -- self.grid.attach(self.advanced.expander, 0, 15, 6, 1) -+ self.grid.attach(self.advanced.expander, 0, 15, 6, 1) - - else: - self.advanced = None -diff --git a/tests/blivetgui_tests/add_dialog_test.py b/tests/blivetgui_tests/add_dialog_test.py -index 4a53ca5..9d1b3e6 100644 ---- a/tests/blivetgui_tests/add_dialog_test.py -+++ b/tests/blivetgui_tests/add_dialog_test.py -@@ -10,6 +10,7 @@ - - from blivet.size import Size - from blivet import formats -+from blivet.devicelibs import raid - - - def supported_filesystems(): -@@ -583,6 +584,17 @@ def test_raid_type(self): - # raid0 type is selected --> we should have 2 size areas, both with max size 4 GiB (smaller free space size) - self.assertEqual(add_dialog.size_area.max_size, Size("8 GiB")) - -+ # raid0 is selected --> advanced options (chunk size) should be visible -+ self.assertIsNotNone(add_dialog.advanced) -+ -+ # select raid1 --> advanced options (chunk size) should be disappear -+ add_dialog._raid_chooser.selected_level = raid.RAID1 -+ self.assertIsNone(add_dialog.advanced) -+ -+ # back to raid0 just to be sure -+ add_dialog._raid_chooser.selected_level = raid.RAID0 -+ self.assertIsNotNone(add_dialog.advanced) -+ - @patch("blivetgui.dialogs.message_dialogs.ErrorDialog", error_dialog) - def test_mountpoint_validity_check(self): - parent_device = self._get_parent_device() diff --git a/0001-Use-symbolic-list-add-and-edit-icons-Adwaita-dropped.patch b/0001-Use-symbolic-list-add-and-edit-icons-Adwaita-dropped.patch deleted file mode 100644 index 582b7db..0000000 --- a/0001-Use-symbolic-list-add-and-edit-icons-Adwaita-dropped.patch +++ /dev/null @@ -1,55 +0,0 @@ -From eb8ec968d1ee8b4b710568b1eb8536296f90751e Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 17 Feb 2022 11:16:22 -0800 -Subject: [PATCH] Use symbolic list-add and edit- icons (Adwaita dropped old - ones) - -adwaita-icon-theme 42 no longer includes the non-symbolic icons -for these names. The choices are to switch to symbolic ones or -carry the non-symbolic ones downstream. - -Signed-off-by: Adam Williamson ---- - blivetgui/list_actions.py | 8 ++++---- - blivetgui/processing_window.py | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/blivetgui/list_actions.py b/blivetgui/list_actions.py -index b7c1f9c..5388feb 100644 ---- a/blivetgui/list_actions.py -+++ b/blivetgui/list_actions.py -@@ -48,10 +48,10 @@ class ListActions(object): - self.blivet_gui = blivet_gui - - icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter -- icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add", 16, 0) -- icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete", 16, 0) -- icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all", 16, 0) -- icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste", 16, 0) -+ icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add-symbolic", 16, 0) -+ icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete-symbolic", 16, 0) -+ icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all-symbolic", 16, 0) -+ icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste-symbolic", 16, 0) - - self.action_icons = {"add": icon_add, "delete": icon_delete, "edit": icon_edit, - "misc": icon_misc} -diff --git a/blivetgui/processing_window.py b/blivetgui/processing_window.py -index c400f90..a020ae8 100644 ---- a/blivetgui/processing_window.py -+++ b/blivetgui/processing_window.py -@@ -93,9 +93,9 @@ class ProcessingActions(Gtk.Dialog): - """ - - icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter -- icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add", 16, 0) -- icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete", 16, 0) -- icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all", 16, 0) -+ icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add-symbolic", 16, 0) -+ icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete-symbolic", 16, 0) -+ icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all-symbolic", 16, 0) - - actions_list = Gtk.ListStore(GdkPixbuf.Pixbuf, str, GdkPixbuf.Pixbuf) - --- -2.35.1 - diff --git a/294.patch b/294.patch deleted file mode 100644 index 082bcf9..0000000 --- a/294.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 083c30a02f9335965fc1b27984e39f6fe443c590 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Tue, 21 Sep 2021 12:44:26 +0200 -Subject: [PATCH] Fix DeviceFormatError when removing a non-existing MD array - -We can't run format.teardown() for formats that have not been -created yet. - -Resolves: rhbz#2005289 ---- - blivetgui/blivet_utils.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py -index 6fe99a7..e7d23da 100644 ---- a/blivetgui/blivet_utils.py -+++ b/blivetgui/blivet_utils.py -@@ -598,11 +598,12 @@ def delete_device(self, blivet_device, delete_parents): - # the mdmember format from the parents - if blivet_device.type == "mdarray": - for parent in blivet_device.parents: -- try: -- parent.format.teardown() -- except Exception as e: # pylint: disable=broad-except -- return ProxyDataContainer(success=False, actions=None, message=None, exception=e, -- traceback=traceback.format_exc()) -+ if parent.format.exists: -+ try: -+ parent.format.teardown() -+ except Exception as e: # pylint: disable=broad-except -+ return ProxyDataContainer(success=False, actions=None, message=None, exception=e, -+ traceback=traceback.format_exc()) - result = self._delete_format(parent) - if not result.success: - return result diff --git a/blivet-gui.spec b/blivet-gui.spec index 8ce3b75..3cc5ae8 100644 --- a/blivet-gui.spec +++ b/blivet-gui.spec @@ -1,17 +1,9 @@ Summary: Tool for data storage configuration Name: blivet-gui -Version: 2.3.0 -Release: 8%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Source0: http://github.com/storaged-project/blivet-gui/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-Do-not-allow-setting-chunk-size-for-RAID1.patch -# https://github.com/storaged-project/blivet-gui/pull/294 -# Fix DeviceFormatError when removing an MD array that hadn't been -# created yet -# https://bugzilla.redhat.com/show_bug.cgi?id=2005289 -Patch1: 294.patch -# https://github.com/storaged-project/blivet-gui/pull/331 -# Fix to work with adwaita-icon-theme 42+ (old icons dropped) -Patch2: 0001-Use-symbolic-list-add-and-edit-icons-Adwaita-dropped.patch +Source1: blivet-gui_event.conf License: GPLv2+ BuildArch: noarch URL: http://github.com/storaged-project/blivet-gui @@ -21,6 +13,7 @@ BuildRequires: libappstream-glib Requires: blivet-gui-runtime = %{version}-%{release} Requires: PolicyKit-authentication-agent +Requires: polkit Requires: libblockdev-plugins-all %description @@ -37,7 +30,7 @@ BuildRequires: make Requires: python3 Requires: python3-gobject -Requires: python3-blivet >= 1:3.1.2 +Requires: python3-blivet >= 1:3.3.0 Requires: gtk3 Requires: python3-pid Requires: libreport @@ -58,6 +51,9 @@ make DESTDIR=%{buildroot} install desktop-file-validate %{buildroot}/%{_datadir}/applications/blivet-gui.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/blivet-gui.appdata.xml +mkdir -p %{buildroot}/%{_sysconfdir}/libreport/events.d/ +install -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/libreport/events.d/ + mkdir -p %{buildroot}/%{_localstatedir}/log/blivet-gui %find_lang %{name} @@ -78,6 +74,122 @@ mkdir -p %{buildroot}/%{_localstatedir}/log/blivet-gui %{_sysconfdir}/libreport/events.d/blivet-gui_event.conf %changelog +* Sun Sep 18 2022 Vojtech Trefny - 2.4.0-1 +- Translated using Weblate (Russian) (mistresssilvara) +- Translated using Weblate (Russian) (xasertop) +- misc: Add vagrant and ansible configuration for openSUSE (vtrefny) +- packit: Add srpm_build_deps for SRPM builds in Copr (vtrefny) +- Tell blivet to ignore zRAM devices (vtrefny) +- Translated using Weblate (Portuguese (Brazil)) (mairacanal) +- Use "folder" icon for LVM and other "complex" devices (vtrefny) +- Translated using Weblate (Hungarian) (meskobalazs) +- Check arguments when running blivet-gui-daemon (#2106214) (vtrefny) +- Translated using Weblate (Georgian) (temuri.doghonadze) +- Translated using Weblate (Georgian) (temuri.doghonadze) +- Added translation using Weblate (Georgian) (temuri.doghonadze) +- misc: Vagrantfile updated with latest Fedora and Ubuntu releases (vtrefny) +- Do not install the libreport/abrt configuration in setup.py (vtrefny) +- Remove python3-mock from test dependencies (vtrefny) +- ci: Use latest checkout action in GitHub actions (vtrefny) +- Replace pocketlint with a custom script (vtrefny) +- ci: Run static analysis checks in GitHub actions (vtrefny) +- Translated using Weblate (Friulian) (f.t.public) +- pylint: Remove deprecated pylint warnings from pylintrc and code (vtrefny) +- Translated using Weblate (Spanish) (alex) +- Translated using Weblate (Swedish) (bittin) +- Translated using Weblate (Bengali (India)) (mitra_anirban) +- Translated using Weblate (Slovak) (feonsu) +- spec: Remove dependecy on gettext (vtrefny) +- Translated using Weblate (Spanish) (alex) +- Translated using Weblate (Czech) (pavel.borecki) +- Translated using Weblate (Croatian) (linux.hr) +- Translated using Weblate (Korean) (simmon) +- Translated using Weblate (Turkish) (oguz) +- Translated using Weblate (Finnish) (ricky.tigg) +- Translated using Weblate (Ukrainian) (yurchor) +- Translated using Weblate (Polish) (piotrdrag) +- Update translation files (noreply) +- Fix grammar for some visible labels in LVMEditDialog (vtrefny) +- appdata: Remove information about kickstart support (vtrefny) +- pylint: Allow loading all C extensions (vtrefny) +- POT file update (vtrefny) +- Add missing log calls for utils functions (vtrefny) +- Use close button for the device info dialog instead of cancel (vtrefny) +- Change label for the LUKS "decrypt" menu item to "unlock" (vtrefny) +- Small UI adjustments in FormatDialog (vtrefny) +- POT file update (vtrefny) +- Remove old remnants of Python 2 support (vtrefny) +- Add tooltips for the toolbar buttons (vtrefny) +- Remove unused code from actions list (vtrefny) +- Log set_mountpoint operation to the utils log (vtrefny) +- utils: Add function to log to the utils log (vtrefny) +- Various grammar fixes in README.md, CONTRIBUTING.md and doc/intro.rst (vtrefny) +- tests: Add tests for dialogs helper functions (vtrefny) +- tests: Add test for ResizeDialog (vtrefny) +- tests: Add test for UnmountDialog (vtrefny) +- tests: Add test for LabelDialog (vtrefny) +- tests: Add test for MountpointDialog (vtrefny) +- Add more tests for ListPartitions covering missing functions (vtrefny) +- Remove some old/unused variables from Makefile (vtrefny) +- tests: Add test for partition resizing (vtrefny) +- miscs: Update Vagrantfile (vtrefny) +- Translated using Weblate (Slovak) (feonsu) +- Use symbolic list-add and edit- icons (Adwaita dropped old ones) (awilliam) +- CONTRIBUTING.md: Fix instructions for installing test dependencies (vtrefny) +- spec: Add explicit dependency on polkit (vtrefny) +- Translated using Weblate (Croatian) (linux.hr) +- Translated using Weblate (French) (julroy67) +- Translated using Weblate (Portuguese (Brazil)) (sigmasquadron) +- Fix title for the label dialog (vtrefny) +- Translated using Weblate (Swedish) (goeran) +- Translated using Weblate (Indonesian) (andika) +- Translated using Weblate (Turkish) (oguzersen) +- Translated using Weblate (Finnish) (copper_fin) +- ui: Add Gtk.ScrolledWindow as parent for the logical Gtk.TreeView (vtrefny) +- Fix displaying mountpoints for btrfs subvolumes (vtrefny) +- Translated using Weblate (Korean) (simmon) +- Translated using Weblate (Ukrainian) (yurchor) +- Translated using Weblate (Polish) (piotrdrag) +- Update translation files (noreply) +- Translated using Weblate (Swedish) (goeran) +- Translated using Weblate (Swedish) (bittin) +- Translated using Weblate (Swedish) (goeran) +- Fix removing encrypted parents (vtrefny) +- Bump required version of blivet to 3.3.0 (vtrefny) +- Add support for specifying sector size for LUKS devices (vtrefny) +- Translated using Weblate (Swedish) (goeran) +- Added translation using Weblate (Swedish) (goeran) +- Translated using Weblate (German) (atalanttore) +- Squashed 'translation-canary/' changes from 4d4e65b..d6a4098 (vtrefny) +- Translated using Weblate (Croatian) (tomislav.krznar) +- Translated using Weblate (Chinese (Simplified) (zh_CN)) (lchopn) +- Translated using Weblate (Indonesian) (andika) +- Translated using Weblate (German) (atalanttore) +- Translated using Weblate (Korean) (simmon) +- Translated using Weblate (Friulian) (f.t.public) +- Translated using Weblate (Hungarian) (meskobalazs) +- Translated using Weblate (Spanish) (perikiyoxd) +- Translated using Weblate (Croatian) (linux.hr) +- Translated using Weblate (Croatian) (linux.hr) +- Fix some PEP 8 issues in doc/conf.py (vtrefny) +- pylint: Remove redundant 'u' prefixes for strings in doc/conf.py (vtrefny) +- pylint: Specify encoding for open() (vtrefny) +- Translated using Weblate (French) (itotutona) +- Translated using Weblate (Croatian) (linux.hr) +- Revert "Translations update from Weblate" (vtrefny) +- Added translation using Weblate (Croatian) (linux.hr) +- Translated using Weblate (Slovak) (feonsu) +- Translated using Weblate (Czech) (pavel.borecki) +- Fix DeviceFormatError when removing a non-existing MD array (vtrefny) +- Translated using Weblate (Korean) (simmon) +- Translated using Weblate (Turkish) (oguzersen) +- Translated using Weblate (Ukrainian) (yurchor) +- Translated using Weblate (Finnish) (copper_fin) +- Translated using Weblate (Polish) (piotrdrag) +- Update translation files (noreply) +- Translated using Weblate (Turkish) (oguzersen) +- README: Add information about OpenMandriva repo (vtrefny) + * Wed Aug 10 2022 Vojtech Trefny - 2.3.0-8 - Drop dependecy on gettext diff --git a/blivet-gui_event.conf b/blivet-gui_event.conf new file mode 100644 index 0000000..7e575d0 --- /dev/null +++ b/blivet-gui_event.conf @@ -0,0 +1,5 @@ +EVENT=notify component=blivet-gui + # Copy log files of crashed process + cp /var/log/blivet-gui/blivet.log blivet.log + cp /var/log/blivet-gui/program.log program.log + cp /var/log/blivet-gui/blivet-gui-utils.log blivet-gui-utils.log diff --git a/sources b/sources index 263a64c..2e3c5b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blivet-gui-2.3.0.tar.gz) = cf13480e076355e340198d83ea77b04338803e8fb1a5d2a942ae7754f28c5e6e48cbadef500ff053e2c3a0b795c8a0f4757c1da5e728f557ae7f551a0d6f5746 +SHA512 (blivet-gui-2.4.0.tar.gz) = db6595e0fe88dfa511c4f0dc20681843d91d5b3b7063b8c3a5485a111d3f7143e171849e6f6dab4d975ad7ee6633a22782b1c82ebfa93607050c89a84f189840