on master help sign in
PParser.hs: filename: Explain failed parse with |fail|
67ff67eJeremy W. Sherman
src/Pkg/PParser.hs+3−2
@@ -79,8 +79,9 @@ filename = (do
79 -- Through at least version 0.9.19.1, IPKG executable values were
79 -- Through at least version 0.9.19.1, IPKG executable values were
80 -- possibly namespaced identifiers, like foo.bar.baz.
80 -- possibly namespaced identifiers, like foo.bar.baz.
81 show <$> fst <$> iName []
81 show <$> fst <$> iName []
82− guard $ isValidFilename filename
82+ if isValidFilename filename
83− return filename)
83+ then return filename
84+ else fail "a filename must be non-empty and have no directory component")
84 <?> "filename"
85 <?> "filename"
85 where
86 where
86 isValidFilename :: FilePath -> Bool
87 isValidFilename :: FilePath -> Bool