Skip to content

Don't allow empty string as description - take II #1831

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.

Sign up for GitHub

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

Merged
forki merged 2 commits into from
Jul 25, 2016
Merged

Don't allow empty string as description - take II #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfd58c0
Don't return empty string as description
inosik Jul 25, 2016
0080050
Fix error message for missing metadata
inosik Jul 25, 2016
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
2 changes: 1 addition & 1 deletion src/Paket.Core/PackageMetaData.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ let getTitle attributes =

let getDescription attributes =
attributes
|> Seq.tryPick (function Description d -> Some d | _ -> None)
|> Seq.tryPick (function Description d when notNullOrEmpty d -> Some d | _ -> None)

let readAssembly fileName =
traceVerbose <| sprintf "Loading assembly metadata for %s" fileName
Expand Down
2 changes: 1 addition & 1 deletion src/Paket.Core/PackageProcess.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ let private merge buildConfig buildPlatform versionFromAssembly specificVersions
failwithf
"Incomplete mandatory metadata in template file %s (even including assembly attributes)%sTemplate: %A%sMissing: %s"
templateFile.FileName
Environment.NewLine md
Environment.NewLine merged
Environment.NewLine missing

| Valid completeCore -> { templateFile with Contents = CompleteInfo(completeCore, mergedOpt) }
Expand Down