[aura] Fix pacman.conf line parsing logic - fixes #697

fosskers · Mar 9, 2021 · 7525ccc · 7525ccc
1 parent 2f9f3e3
commit 7525ccc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/aura/lib/Aura/Settings/External.hs b/aura/lib/Aura/Settings/External.hs
@@ -106,8 +106,7 @@ single = L.lexeme garbage . void $ manyTill letterChar newline
 
 pair :: Parsec Void Text (Text, [Text])
 pair = L.lexeme garbage $ do
-  n <- takeWhile1P Nothing (/= ' ')
-  space
+  n <- T.stripEnd <$> takeWhile1P Nothing (/= '=')
   void $ char '='
   space
   rest <- T.words <$> takeWhile1P Nothing (/= '\n')

diff --git a/aura/test/Test.hs b/aura/test/Test.hs
@@ -59,8 +59,11 @@ suite conf badRaw goodRaw = testGroup "Unit Tests"
   , testGroup "Aura.Pacman"
     [ testCase "Parsing pacman.conf" $ do
         let p = parse config "pacman.conf" conf
-            r = either (const Nothing) (\(Config c) -> Just c) p >>= M.lookup "HoldPkg"
-        r @?= Just ["pacman", "glibc"]
+            r = either (const Nothing) (\(Config c) -> Just c) p
+        (r >>= M.lookup "HoldPkg") @?= Just ["pacman", "glibc"]
+        (r >>= M.lookup "GoodLine") @?= Just ["good"]
+        (r >>= M.lookup "BadLine") @?= Just ["bad"]
+        (r >>= M.lookup "OkLine") @?= Just ["ok"]
     ]
   , testGroup "Aura.Languages"
     [ testCase "Language names are complete" $ do

diff --git a/aura/test/pacman.conf b/aura/test/pacman.conf
@@ -21,6 +21,9 @@ HoldPkg     = pacman glibc
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7
 Architecture = auto
+GoodLine = good
+BadLine= bad
+OkLine =ok
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =