[arch-commits] Commit in hal/repos (2 files)

[Pierre Schmitz]

    Date: Sunday, September 14, 2008 @ 06:46:57
  Author: pierre
Revision: 12449

Merged revisions 12448 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/hal/trunk

........
  r12448 | pierre | 2008-09-14 10:46:14 +0000 (So, 14 Sep 2008) | 2 lines
  
  upgpkg: hal 0.5.11-4
      fix FS#8677
........

Added:
  hal/repos/testing-x86_64/ntfs-mount-fix.patch
    (from rev 12448, hal/trunk/ntfs-mount-fix.patch)
Modified:
  hal/repos/testing-x86_64/	(properties)

----------------------+
 ntfs-mount-fix.patch |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)


Property changes on: hal/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /hal/trunk:1-12446
   + /hal/trunk:1-12448

Copied: hal/repos/testing-x86_64/ntfs-mount-fix.patch (from rev 12448, hal/trunk/ntfs-mount-fix.patch)
===================================================================
--- testing-x86_64/ntfs-mount-fix.patch	                        (rev 0)
+++ testing-x86_64/ntfs-mount-fix.patch	2008-09-14 10:46:57 UTC (rev 12449)
@@ -0,0 +1,18 @@
+--- tools/hal-storage-mount.c.orig	2008-04-21 01:48:27.000000000 +0200
++++ tools/hal-storage-mount.c	2008-04-21 01:47:44.000000000 +0200
+@@ -769,13 +769,13 @@
+ 
+ 	if (pol_is_fixed) {
+ 		if (pol_change_uid) {
+-			action = NULL; /* "hal-storage-mount-fixed-extra-options"; TODO: rethink */
++			action = "hal-storage-mount-fixed-extra-options"; /*TODO: rethink */
+ 		} else {
+ 			action = "org.freedesktop.hal.storage.mount-fixed";
+ 		}
+ 	} else {
+ 		if (pol_change_uid) {
+-			action = NULL; /* "hal-storage-mount-removable-extra-options"; TODO: rethink "extra-options" */
++			action = "hal-storage-mount-removable-extra-options"; /*TODO: rethink "extra-options" */
+ 		} else {
+ 			action = "org.freedesktop.hal.storage.mount-removable";
+ 		}