diff options
author | Joachim Breitner <mail@joachim-breitner.de> | 2018-03-21 17:02:21 -0400 |
---|---|---|
committer | Joachim Breitner <mail@joachim-breitner.de> | 2018-03-21 17:02:21 -0400 |
commit | 4a47fd33d2f16070d4fe8bd32a104587608061cd (patch) | |
tree | 204afacf3bf4177de01b8f2778f4154c26bf578b /docs/users_guide/ghc_packages.py | |
parent | c663b715b6201d460e8bf2b6fb26e61c700384e0 (diff) | |
parent | 0aa7d8796a95298e906ea81fe4a52590d75c2e47 (diff) | |
download | haskell-wip/T14068.tar.gz |
Merge branch 'wip/T14951' into wip/T14068wip/T14068
Diffstat (limited to 'docs/users_guide/ghc_packages.py')
-rw-r--r-- | docs/users_guide/ghc_packages.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/users_guide/ghc_packages.py b/docs/users_guide/ghc_packages.py index d4a688b370..6419834e1e 100644 --- a/docs/users_guide/ghc_packages.py +++ b/docs/users_guide/ghc_packages.py @@ -8,13 +8,13 @@ from utils import build_table_from_list def read_cabal_file(pkg_path): import re cabal_file = open(pkg_path, 'r').read() - pkg_name = re.search(r'[nN]ame:\s*([-a-zA-Z0-9]+)', cabal_file) + pkg_name = re.search(r'^[nN]ame\s*:\s*([-a-zA-Z0-9]+)', cabal_file, re.MULTILINE) if pkg_name is not None: pkg_name = pkg_name.group(1) else: raise RuntimeError("Failed to parse `Name:` field from %s" % pkg_path) - pkg_version = re.search(r'[vV]ersion:\s*(\d+(\.\d+)*)', cabal_file) + pkg_version = re.search(r'^[vV]ersion\s*:\s*(\d+(\.\d+)*)', cabal_file, re.MULTILINE) if pkg_version is not None: pkg_version = pkg_version.group(1) else: |