Skip to content

Only match org.freedesktop.zbus.Error for property setting #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mulkieran wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Only match org.freedesktop.zbus.Error for property setting #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5f3068
Only match org.freedesktop.zbus.Error for property setting
mulkieran Jan 6, 2026
634d751
Remove name attribute from GetManagedObjects out arg
mulkieran Feb 18, 2026
8e3125d
Add signal information belonging to ObjectManager
mulkieran Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/stratis_cli/_actions/_introspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@
"org.freedesktop.DBus.ObjectManager": """
<interface name="org.freedesktop.DBus.ObjectManager">
<method name="GetManagedObjects">
<arg name="objpath_interfaces_and_properties" type="a{oa{sa{sv}}}" direction="out" />
<arg type="a{oa{sa{sv}}}" direction="out" />
</method>
<signal name="InterfacesAdded">
<arg name="object_path" type="o" />
<arg name="interfaces_and_properties" type="a{sa{sv}}" />
</signal>
<signal name="InterfacesRemoved">
<arg name="object_path" type="o" />
<arg name="interfaces" type="as" />
</signal>
</interface>
""",
"org.storage.stratis3.Manager.r9": """
Expand Down
11 changes: 1 addition & 10 deletions src/stratis_cli/_error_reporting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def _interpret_errors_2( # pylint: disable=too-many-return-statements

if dbus_name == "org.freedesktop.zbus.Error" and isinstance(
context, DPClientSetPropertyContext
): # pragma: no cover
):
return (
f"stratisd failed to perform the operation that you "
f"requested, because it could not set the D-Bus "
Expand Down Expand Up @@ -335,15 +335,6 @@ def _interpret_errors_2( # pylint: disable=too-many-return-statements
f"service sent the following message: {dbus_message}."
)

if isinstance(context, DPClientSetPropertyContext): # pragma: no cover
return (
f"stratisd failed to perform the operation that you "
f"requested, because it could not set the D-Bus "
f'property "{context.property_name}" belonging to '
f'interface "{error.interface_name}" to "{context.value}". '
f"It returned the following error: {dbus_message}."
)

if isinstance(context, DPClientGetPropertyContext): # pragma: no cover
return (
f"stratisd failed to perform the operation that you "
Expand Down
Loading