Tree - rpms/git-annex - src.fedoraproject.org

rpms / git-annex

Overview Files Commits Branches Forks Releases
Monitoring status:

Bugzilla Assignee:

Fedora:: mathstuf
EPEL:: mathstuf
Files

Blob Blame History Raw
diff -up git-annex-5.20140717/Logs/MapLog.hs~ git-annex-5.20140717/Logs/MapLog.hs
--- git-annex-5.20140717/Logs/MapLog.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/MapLog.hs	2016-06-20 15:18:33.582779377 +0900
@@ -14,7 +14,7 @@ module Logs.MapLog where
 import qualified Data.Map as M
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
   
 import Common
 
diff -up git-annex-5.20140717/Logs/MetaData.hs~ git-annex-5.20140717/Logs/MetaData.hs
--- git-annex-5.20140717/Logs/MetaData.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/MetaData.hs	2016-06-20 15:22:46.191626318 +0900
@@ -45,7 +45,7 @@ import qualified Data.Set as S
 import qualified Data.Map as M
 import Data.Time.Clock.POSIX
 import Data.Time.Format
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 
 instance SingleValueSerializable MetaData where
 	serialize = Types.MetaData.serialize
diff -up git-annex-5.20140717/Logs/Presence/Pure.hs~ git-annex-5.20140717/Logs/Presence/Pure.hs
--- git-annex-5.20140717/Logs/Presence/Pure.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/Presence/Pure.hs	2016-06-20 15:19:56.816058436 +0900
@@ -9,7 +9,7 @@ module Logs.Presence.Pure where
 
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 import qualified Data.Map as M
 
 import Common.Annex
diff -up git-annex-5.20140717/Logs/SingleValue.hs~ git-annex-5.20140717/Logs/SingleValue.hs
--- git-annex-5.20140717/Logs/SingleValue.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/SingleValue.hs	2016-06-20 15:22:22.991548533 +0900
@@ -19,7 +19,7 @@ import qualified Annex.Branch
 import qualified Data.Set as S
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 
 class SingleValueSerializable v where
 	serialize :: v -> String
diff -up git-annex-5.20140717/Logs/Transfer.hs~ git-annex-5.20140717/Logs/Transfer.hs
--- git-annex-5.20140717/Logs/Transfer.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/Transfer.hs	2016-06-20 15:21:53.039448115 +0900
@@ -25,7 +25,7 @@ import Utility.WinLock
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 import Control.Concurrent
 
 {- Enough information to uniquely identify a transfer, used as the filename
diff -up git-annex-5.20140717/Logs/Transitions.hs~ git-annex-5.20140717/Logs/Transitions.hs
--- git-annex-5.20140717/Logs/Transitions.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/Transitions.hs	2016-06-20 15:20:37.054193348 +0900
@@ -16,7 +16,7 @@ module Logs.Transitions where
 
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 import qualified Data.Set as S
 
 import Common.Annex
diff -up git-annex-5.20140717/Logs/Unused.hs~ git-annex-5.20140717/Logs/Unused.hs
--- git-annex-5.20140717/Logs/Unused.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/Unused.hs	2016-06-20 15:21:05.110287417 +0900
@@ -32,7 +32,7 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 
 import Common.Annex
 import qualified Annex
diff -up git-annex-5.20140717/Logs/UUIDBased.hs~ git-annex-5.20140717/Logs/UUIDBased.hs
--- git-annex-5.20140717/Logs/UUIDBased.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Logs/UUIDBased.hs	2016-06-20 15:19:02.086874939 +0900
@@ -31,7 +31,7 @@ module Logs.UUIDBased (
 import qualified Data.Map as M
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 
 import Common
 import Types.UUID
diff -up git-annex-5.20140717/Assistant/DaemonStatus.hs~ git-annex-5.20140717/Assistant/DaemonStatus.hs
--- git-annex-5.20140717/Assistant/DaemonStatus.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Assistant/DaemonStatus.hs	2016-06-20 15:44:05.299878768 +0900
@@ -24,7 +24,7 @@ import Control.Concurrent.STM
 import System.Posix.Types
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 import qualified Data.Map as M
 import qualified Data.Set as S
 import qualified Data.Text as T
diff -up git-annex-5.20140717/Command/Fsck.hs~ git-annex-5.20140717/Command/Fsck.hs
--- git-annex-5.20140717/Command/Fsck.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Command/Fsck.hs	2016-06-20 15:45:16.604113254 +0900
@@ -37,7 +37,7 @@ import Utility.PID
 import Data.Time.Clock.POSIX
 import Data.Time
 import System.Posix.Types (EpochTime)
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 
 def :: [Command]
 def = [withOptions fsckOptions $ command "fsck" paramPaths seek
diff -up git-annex-5.20140717/Command/Log.hs~ git-annex-5.20140717/Command/Log.hs
--- git-annex-5.20140717/Command/Log.hs~	2014-07-18 00:53:21.000000000 +0900
+++ git-annex-5.20140717/Command/Log.hs	2016-06-20 15:42:58.099657775 +0900
@@ -12,7 +12,7 @@ import qualified Data.Map as M
 import qualified Data.ByteString.Lazy.Char8 as L
 import Data.Time.Clock.POSIX
 import Data.Time
-import System.Locale
+import System.Locale hiding (defaultTimeLocale)
 import Data.Char
 
 import Common.Annex
rpms / git-annex

Source Code

Files
