From 44934497a75a5b77d3d46b508ec1eb62966f1118 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 8 Dec 2008 01:34:19 +0000 Subject: [PATCH] Fix patch. --- kdelibs-4.1.3-policykit-workaround.patch | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/kdelibs-4.1.3-policykit-workaround.patch b/kdelibs-4.1.3-policykit-workaround.patch index 3af19ab..053c9bc 100644 --- a/kdelibs-4.1.3-policykit-workaround.patch +++ b/kdelibs-4.1.3-policykit-workaround.patch @@ -1,6 +1,6 @@ diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp --- kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp 2008-10-30 14:24:05.000000000 +0100 -+++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2008-12-08 02:07:20.000000000 +0100 ++++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2008-12-08 02:31:43.000000000 +0100 @@ -17,10 +17,13 @@ */ @@ -37,7 +37,14 @@ diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1 m_teardownInProgress = false; emit teardownDone(Solid::UnauthorizedOperation, error.name()+": "+error.message(), -@@ -241,7 +254,8 @@ +@@ -235,17 +248,18 @@ + "Mount"); + QStringList options; + QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList(); ++ QString fstype=m_device->property("volume.fstype").toString(); + + #ifdef Q_OS_FREEBSD + QString uid="-u="; #else QString uid="uid="; #endif @@ -47,6 +54,10 @@ diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1 options << uid+QString::number(::getuid()); } +- QString fstype=m_device->property("volume.fstype").toString(); + #ifdef Q_OS_FREEBSD + char *cType; + if ( fstype=="vfat" && halOptions.contains("-L=")) { @@ -297,6 +311,59 @@ SLOT(slotDBusError(const QDBusError &))); }