squeeze 1.0.4.5 → 1.0.4.6

raw patch · 7 files changed

+12/−10 lines, 7 filesdep −unix

Dependencies removed: unix

Files

• changelog +2/−0
• changelog.Debian +2/−0
• debian/DEBIAN/control +1/−1
• squeeze.cabal +2/−3
• squeeze.spec +1/−1
• src/Main.hs +1/−1
• src/Squeeze/Data/File.hs +3/−4

@@ -102,3 +102,5 @@ 1.0.4.5 	* Added the compiler to the output returned for the command-line option "version". 	* Specified compiler-option 'context-stack' in 'Main.hs', to account for call to printf.+1.0.4.6+	* Minimised the explicit size of compiler's 'context-stack' in 'Main.hs'.

@@ -15,3 +15,5 @@   * Re-calculated "Installed-size".   -- Alistair Ward <squeeze at functionalley dot eu>  Wed, 24 Jul 2013 12:00:00 +0000++squeeze (1.0.4.6-1) experimental; urgency=low

@@ -1,5 +1,5 @@ Package:	squeeze-Version:	1.0.4.4-1+Version:	1.0.4.6-1 Section:	utils Priority:	optional #Architecture:	i386

@@ -1,6 +1,6 @@ -- Package-properties Name:			squeeze-Version:		1.0.4.5+Version:		1.0.4.6 Cabal-Version:		>= 1.6 Copyright:		(C) 2010-2015 Dr. Alistair Ward License:		GPL@@ -53,8 +53,7 @@         mtl,         QuickCheck >= 2.4,         random,-        toolshed >= 0.14,-        unix+        toolshed >= 0.14      GHC-options:	-Wall -O2 -fno-warn-tabs 

@@ -22,7 +22,7 @@  Summary:	Finds the optimal subset of the specified files, to fit into a limited space, with minimal wastage Name:		squeeze-Version:	1.0.4.4+Version:	1.0.4.6 Release:	1 License:	GPLv3 #From '/usr/share/doc/packages/rpm/GROUPS'.

@@ -1,4 +1,4 @@-{-# OPTIONS_GHC -fcontext-stack=32 #-}+{-# OPTIONS_GHC -fcontext-stack=23 #-} {- 	Copyright (C) 2010-2015 Dr. Alistair Ward 

@@ -53,7 +53,6 @@ import qualified	System.Directory import			System.FilePath((</>)) import qualified	System.IO-import qualified	System.Posix.Files import qualified	ToolShed.Data.Foldable  -- | A type suitable for containing an arbitrary set of file-paths.@@ -92,15 +91,15 @@ -} expandDirectory :: System.IO.FilePath -> IO FilePathList expandDirectory filePath	= do-	stat	<- System.Posix.Files.getFileStatus filePath	-- CAVEAT: throws if the user is unauthorised, or the file is non-existent.+	directoryExists	<- System.Directory.doesDirectoryExist filePath -	if System.Posix.Files.isDirectory stat+	if directoryExists 		then System.Directory.getDirectoryContents filePath >>= fmap concat . mapM ( 			expandDirectory {-recurse-} . (filePath </>) {-qualify the path-} 		) . filter ( 			`notElem` [".", ".."]	-- Prevent infinite recursion. 		)-		else {-non-directory-} return {-to IO-monad-} [filePath]	-- CAVEAT: this could include devices, pipes, sockets, symlinks ...+		else {-non-directory-} return {-to IO-monad-} [filePath]	-- CAVEAT: this could include non-existent paths, devices, pipes, sockets, symlinks ...  {- | 	* Finds any file-paths which have been specified more than once.