pool/udisks2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 147391 from home:StefanBruens:branches:Base:System

Browse Source 
fix fdo#58629
same as MR#1196 against openSUSE_12.2:Update

OBS-URL: https://build.opensuse.org/request/show/147391
OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=24
This commit is contained in:
Vincent Untz 2013-01-09 14:37:01 +00:00 committed by Git OBS Bridge
parent 00c26c1643
commit 06f5e4fd8f
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fix_polkit_action_name.diff Normal file
View File

@ -0,0 +1,53 @@
diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c
index 9582346..e3ae93f 100644
--- a/src/udiskslinuxpartition.c
+++ b/src/udiskslinuxpartition.c
@@ -269,7 +269,7 @@ handle_set_flags (UDisksPartition *partition,
}
else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
{
- action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
+ action_id = "org.freedesktop.udisks2.modify-device-other-seat";
}
if (!udisks_daemon_util_check_authorization_sync (daemon,
@@ -414,7 +414,7 @@ handle_set_name (UDisksPartition *partition,
}
else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
{
- action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
+ action_id = "org.freedesktop.udisks2.modify-device-other-seat";
}
if (!udisks_daemon_util_check_authorization_sync (daemon,
@@ -596,7 +596,7 @@ handle_set_type (UDisksPartition *partition,
}
else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
{
- action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
+ action_id = "org.freedesktop.udisks2.modify-device-other-seat";
}
if (!udisks_daemon_util_check_authorization_sync (daemon,
@@ -769,7 +769,7 @@ handle_delete (UDisksPartition *partition,
}
else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
{
- action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
+ action_id = "org.freedesktop.udisks2.modify-device-other-seat";
}
if (!udisks_daemon_util_check_authorization_sync (daemon,
diff --git a/src/udiskslinuxpartitiontable.c b/src/udiskslinuxpartitiontable.c
index 8f0d3d9..b553625 100644
--- a/src/udiskslinuxpartitiontable.c
+++ b/src/udiskslinuxpartitiontable.c
@@ -336,7 +336,7 @@ handle_create_partition (UDisksPartitionTable *table,
}
else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
{
- action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
+ action_id = "org.freedesktop.udisks2.modify-device-other-seat";
}
if (!udisks_daemon_util_check_authorization_sync (daemon,

6
udisks2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 07 13:30:34 UTC 2013 - stefan.bruens@rwth-aachen.de
- Fix name of polkit action (fdo#58629):
modify-device-system-other-seat -> modify-device-other-seat
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 6 21:02:27 UTC 2013 - dimstar@opensuse.org Sun Jan 6 21:02:27 UTC 2013 - dimstar@opensuse.org

2
udisks2.spec
View File

@ -27,6 +27,8 @@ License: GPL-2.0+
Group: System/Daemons Group: System/Daemons
Url: http://www.freedesktop.org/wiki/Software/udisks Url: http://www.freedesktop.org/wiki/Software/udisks
Source: http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2 Source: http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM fix_polkit_action_name.diff [fdo#58629]
Patch0: fix_polkit_action_name.diff
# Needed to build the man pages # Needed to build the man pages
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel