From e5be81f8d4bf7f6cef5ac4ff0b059efbdf6055ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 20 Jan 2025 19:10:13 -0400
Subject: [PATCH] stop exporting Utility.SystemDirectory from Utility.Directory

---
 Annex/Fixup.hs              | 1 +
 Common.hs                   | 1 +
 Utility/Directory.hs        | 7 ++-----
 Utility/LinuxMkLibs.hs      | 1 +
 Utility/LockFile/PidLock.hs | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs
index a60e4baa0b..112c55224a 100644
--- a/Annex/Fixup.hs
+++ b/Annex/Fixup.hs
@@ -19,6 +19,7 @@ import Utility.Directory
 import Utility.Exception
 import Utility.Monad
 import Utility.FileSystemEncoding
+import Utility.SystemDirectory
 import qualified Utility.RawFilePath as R
 import Utility.PartialPrelude
 
diff --git a/Common.hs b/Common.hs
index c430163063..b1e77b30ff 100644
--- a/Common.hs
+++ b/Common.hs
@@ -24,6 +24,7 @@ import Utility.Process as X
 import Utility.Path as X
 import Utility.Path.AbsRel as X
 import Utility.Directory as X
+import Utility.SystemDirectory as X
 import Utility.MoveFile as X
 import Utility.Monad as X
 import Utility.Data as X
diff --git a/Utility/Directory.hs b/Utility/Directory.hs
index bf997b8606..a0a12998a3 100644
--- a/Utility/Directory.hs
+++ b/Utility/Directory.hs
@@ -1,6 +1,6 @@
 {- directory traversal and manipulation
  -
- - Copyright 2011-2023 Joey Hess <id@joeyh.name>
+ - Copyright 2011-2025 Joey Hess <id@joeyh.name>
  -
  - License: BSD-2-clause
  -}
@@ -9,10 +9,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# OPTIONS_GHC -fno-warn-tabs #-}
 
-module Utility.Directory (
-	module Utility.Directory,
-	module Utility.SystemDirectory
-) where
+module Utility.Directory where
 
 import Control.Monad
 import System.FilePath
diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs
index 55f6998e5e..ec482a1465 100644
--- a/Utility/LinuxMkLibs.hs
+++ b/Utility/LinuxMkLibs.hs
@@ -18,6 +18,7 @@ module Utility.LinuxMkLibs (
 
 import Utility.PartialPrelude
 import Utility.Directory
+import Utility.SystemDirectory
 import Utility.Process
 import Utility.Monad
 import Utility.Path
diff --git a/Utility/LockFile/PidLock.hs b/Utility/LockFile/PidLock.hs
index be4548b0b6..de5436dd4b 100644
--- a/Utility/LockFile/PidLock.hs
+++ b/Utility/LockFile/PidLock.hs
@@ -27,6 +27,7 @@ import Utility.PartialPrelude
 import Utility.Exception
 import Utility.Applicative
 import Utility.Directory
+import Utility.SystemDirectory
 import Utility.Monad
 import Utility.Path.AbsRel
 import Utility.FileMode