rpms/DeviceKit-disks/devel devkit-disks-dashdash.patch, NONE, 1.1 DeviceKit-disks.spec, 1.7, 1.8

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6094

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	devkit-disks-dashdash.patch 
Log Message:
fix -- handling


devkit-disks-dashdash.patch:

--- NEW FILE devkit-disks-dashdash.patch ---
diff -up DeviceKit-disks-003/tools/devkit-disks.c.-- DeviceKit-disks-003/tools/devkit-disks.c
--- DeviceKit-disks-003/tools/devkit-disks.c.--	2009-03-06 11:18:51.290041345 -0500
+++ DeviceKit-disks-003/tools/devkit-disks.c	2009-03-06 11:19:49.244044184 -0500
@@ -1056,6 +1056,11 @@ do_inhibit_polling (const char *object_p
         cookie = NULL;
         ret = 127;
 
+	if (strcmp (argv[0], "--") == 0) {
+		argv++;
+		argc--;
+	}
+
 	proxy = dbus_g_proxy_new_for_name (bus,
                                            "org.freedesktop.DeviceKit.Disks",
                                            object_path,
@@ -1123,6 +1128,11 @@ do_inhibit_all_polling (gint         arg
         cookie = NULL;
         ret = 127;
 
+	if (strcmp (argv[0], "--") == 0) {
+		argv++;
+		argc--;
+	}
+
 	proxy = dbus_g_proxy_new_for_name (bus,
                                            "org.freedesktop.DeviceKit.Disks",
                                            "/",
@@ -1188,6 +1198,11 @@ do_inhibit (gint         argc,
         cookie = NULL;
         ret = 127;
 
+	if (strcmp (argv[0], "--") == 0) {
+		argv++;
+		argc--;
+	}
+
 	proxy = dbus_g_proxy_new_for_name (bus,
                                            "org.freedesktop.DeviceKit.Disks",
                                            "/",


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeviceKit-disks.spec	4 Mar 2009 19:29:25 -0000	1.7
+++ DeviceKit-disks.spec	6 Mar 2009 16:25:26 -0000	1.8
@@ -11,7 +11,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 003
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -40,6 +40,8 @@
 Patch0: devkit-disks-use-devt-to-identify-mounts.patch
 Patch1: devkit-disks-dump-option.patch
 Patch2: devkit-disks-fstab-unmount.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=488850
+Patch3: devkit-disks-dashdash.patch
 
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
@@ -61,6 +63,7 @@
 %patch0 -p1 -b .use-devt-for-mounts
 %patch1 -p1 -b .fstab-unmount
 %patch2 -p1 -b .dump-option
+%patch3 -p1 -b .dashdash
 
 %build
 %configure
@@ -115,6 +118,9 @@
 %{_datadir}/gtk-doc/html/devkit-disks/*
 
 %changelog
+* Fri Mar  6 2009 Matthias Clasen <mclasen at redhat.com> - 003-5
+- Handle -- correctly in devkit-disks
+
 * Wed Mar 04 2009 David Zeuthen <davidz at redhat.com> - 003-3%{?dist}
 - Add --dump option to devkit-disks(1) to help with debugging
 - Allow authorized users to unmount /etc/fstab mounts