Remove patch2, now upstream.
This commit is contained in:
		
							parent
							
								
									65d6c9ef4d
								
							
						
					
					
						commit
						14e3ffa738
					
				| @ -1,31 +0,0 @@ | ||||
| From 184b9d7c11f771a74c981f739c28fa0713f3e3e7 Mon Sep 17 00:00:00 2001 | ||||
| From: "Richard W.M. Jones" <rjones@redhat.com> | ||||
| Date: Fri, 20 Jul 2012 08:34:46 +0100 | ||||
| Subject: [PATCH] ocaml: Skip mount-local test if /dev/fuse is not writable. | ||||
| 
 | ||||
| ---
 | ||||
|  ocaml/t/guestfs_500_mount_local.ml |    8 ++++++++ | ||||
|  1 file changed, 8 insertions(+) | ||||
| 
 | ||||
| diff --git a/ocaml/t/guestfs_500_mount_local.ml b/ocaml/t/guestfs_500_mount_local.ml
 | ||||
| index fb22d02..3047544 100644
 | ||||
| --- a/ocaml/t/guestfs_500_mount_local.ml
 | ||||
| +++ b/ocaml/t/guestfs_500_mount_local.ml
 | ||||
| @@ -30,6 +30,14 @@ let debug = true                     (* overview debugging messages *)
 | ||||
|  let rec main () = | ||||
|    Random.self_init (); | ||||
|   | ||||
| +  let fuse_writable =
 | ||||
| +    try access "/dev/fuse" [W_OK]; true with Unix_error _ -> false in
 | ||||
| +  if not fuse_writable then (
 | ||||
| +    printf "%s: test skipped because /dev/fuse is not writable.\n"
 | ||||
| +      Sys.executable_name;
 | ||||
| +    exit 77
 | ||||
| +  );
 | ||||
| +
 | ||||
|    (* Allow the test to be skipped by setting this environment variable. | ||||
|     * This is for RHEL 5, where FUSE doesn't work very reliably. | ||||
|     *) | ||||
| -- 
 | ||||
| 1.7.10.4 | ||||
| 
 | ||||
| @ -34,9 +34,6 @@ Patch1:        ruby-1.9-vendor-not-site.patch | ||||
| BuildRequires: autoconf, automake, libtool, gettext-devel | ||||
| %endif | ||||
| 
 | ||||
| # Upstream patch to disable OCaml FUSE test when /dev/fuse is not writable. | ||||
| Patch2:        0001-ocaml-Skip-mount-local-test-if-dev-fuse-is-not-writa.patch | ||||
| 
 | ||||
| # Non-upstream patch to remove udev from the packagelist.  systemd now | ||||
| # 'obsoletes' udev, but febootstrap doesn't get this relationship | ||||
| # right.  When udev disappears from the repository we can remove this | ||||
| @ -687,7 +684,6 @@ for %{name}. | ||||
| autoreconf -i | ||||
| %endif | ||||
| 
 | ||||
| %patch2 -p1 | ||||
| %patch4 -p1 | ||||
| 
 | ||||
| mkdir -p daemon/m4 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user