Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove blank line from end of license report #105

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src-exe/LicenseReport.hs
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,16 @@ generateLicenseReport mlicdir plan uid0 cn0 = do
T.hPutStrLn stderr ("WARNING: couldn't find metadata for " <> dispPkgId (uPId u))

T.putStrLn $ mconcat
[ if isB then "| **`" else "| `", pn, if isB then "`** | [`" else "` | [`", dispVer pv, "`](", url , ")", " | "
, " *MISSING* | *MISSING* | "
[ if isB then "| **`" else "| `"
, pn
, if isB then "`** | [`" else "` | [`"
, dispVer pv
, "`]("
, url
, ") | *MISSING* | *MISSING* | "
, if pn `elem` baseLibs then "*(core library)*"
else T.intercalate ", " [ T.singleton '`' <> (j :: T.Text) <> "`" | PkgId (z@(PkgName j)) _ <- Set.toList usedBy, z /= pn0], " |"
else T.intercalate ", " [ T.singleton '`' <> (j :: T.Text) <> "`" | PkgId (z@(PkgName j)) _ <- Set.toList usedBy, z /= pn0]
, " |"
]

Just x -> do
Expand Down Expand Up @@ -239,7 +245,6 @@ generateLicenseReport mlicdir plan uid0 cn0 = do
T.putStrLn "| Name | Version | [SPDX](https://spdx.org/licenses/) License Id | Description | Depended upon by |"
T.putStrLn "| --- | --- | --- | --- | --- |"
forM_ indirectDeps $ printInfo
T.putStrLn ""

pure ()

Expand Down