rpms/DeviceKit-disks/devel DeviceKit-disks.spec, 1.8, 1.9 devkit-disks-dashdash.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

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

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



Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DeviceKit-disks.spec	6 Mar 2009 16:25:26 -0000	1.8
+++ DeviceKit-disks.spec	10 Mar 2009 18:49:28 -0000	1.9
@@ -11,7 +11,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 003
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -118,6 +118,9 @@
 %{_datadir}/gtk-doc/html/devkit-disks/*
 
 %changelog
+* Tue Mar 10 2009 Matthias Clasen <mclasen at redhat.com> - 003-6
+- Fix the previous patch
+
 * Fri Mar  6 2009 Matthias Clasen <mclasen at redhat.com> - 003-5
 - Handle -- correctly in devkit-disks
 

devkit-disks-dashdash.patch:

Index: devkit-disks-dashdash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/devkit-disks-dashdash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- devkit-disks-dashdash.patch	6 Mar 2009 16:25:26 -0000	1.1
+++ devkit-disks-dashdash.patch	10 Mar 2009 18:49:28 -0000	1.2
@@ -1,11 +1,11 @@
-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
+diff -up DeviceKit-disks-003/tools/devkit-disks.c.dashdash DeviceKit-disks-003/tools/devkit-disks.c
+--- DeviceKit-disks-003/tools/devkit-disks.c.dashdash	2009-03-10 14:29:11.648335078 -0400
++++ DeviceKit-disks-003/tools/devkit-disks.c	2009-03-10 14:47:19.498336713 -0400
 @@ -1056,6 +1056,11 @@ do_inhibit_polling (const char *object_p
          cookie = NULL;
          ret = 127;
  
-+	if (strcmp (argv[0], "--") == 0) {
++	if (argc > 0 && strcmp (argv[0], "--") == 0) {
 +		argv++;
 +		argc--;
 +	}
@@ -13,23 +13,27 @@
  	proxy = dbus_g_proxy_new_for_name (bus,
                                             "org.freedesktop.DeviceKit.Disks",
                                             object_path,
-@@ -1123,6 +1128,11 @@ do_inhibit_all_polling (gint         arg
+@@ -1123,9 +1128,14 @@ do_inhibit_all_polling (gint         arg
          cookie = NULL;
          ret = 127;
  
-+	if (strcmp (argv[0], "--") == 0) {
++	if (argc > 0 && strcmp (argv[0], "--") == 0) {
 +		argv++;
 +		argc--;
 +	}
 +
  	proxy = dbus_g_proxy_new_for_name (bus,
                                             "org.freedesktop.DeviceKit.Disks",
-                                            "/",
+-                                           "/",
++                                          "/",
+                                            "org.freedesktop.DeviceKit.Disks");
+ 
+         error = NULL;
 @@ -1188,6 +1198,11 @@ do_inhibit (gint         argc,
          cookie = NULL;
          ret = 127;
  
-+	if (strcmp (argv[0], "--") == 0) {
++	if (argc > 0 && strcmp (argv[0], "--") == 0) {
 +		argv++;
 +		argc--;
 +	}