34 lines
931 B
Diff
34 lines
931 B
Diff
From 42bca7636dadc2ae5ceed47327cc65e772a81834 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Sun, 3 Aug 2014 17:15:42 +0100
|
|
Subject: [PATCH] build: Another corner case in munge function.
|
|
|
|
In Rawhide, /media is now a pointer to /run/media which does
|
|
not exist.
|
|
|
|
This caused us to loop indefinitely in the final case, calling
|
|
|
|
loop ("/" :: "/media" :: rest)
|
|
|
|
because "/" was never marked as "seen". Marking it as seen was the
|
|
simplest way to break this loop.
|
|
---
|
|
src/build.ml | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/build.ml b/src/build.ml
|
|
index 2a28a3f..8ff574b 100644
|
|
--- a/src/build.ml
|
|
+++ b/src/build.ml
|
|
@@ -376,6 +376,7 @@ and munge files =
|
|
|
|
| { ft_path = "/" } :: rest ->
|
|
(* This is just to avoid a corner-case in subsequent rules. *)
|
|
+ insert_dir "/";
|
|
loop rest
|
|
|
|
| dir :: rest when stat_is_dir dir.ft_path && dir_seen dir.ft_path ->
|
|
--
|
|
2.0.4
|
|
|