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

Fixes #18317: Support source package in Rudder inventory #3251

Conversation

VinceMacBuche
Copy link
Member

@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

@VinceMacBuche VinceMacBuche changed the base branch from branches/rudder/6.1 to branches/rudder/6.2 October 12, 2020 14:25
@@ -90,7 +90,7 @@ class NameAndVersionIdFinder(
} yield {
//now merge back
entities.foldLeft(MergedSoftware(Set(),Set())) { case(ms, s) =>
merged.find { x => x.name == s.name && x.version == s.version } match {
merged.find { x => x == s } match {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want to compare ALL fields ? Only name, version, source name, source version ?

@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

1 similar comment
@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder/pull/3251
-- Your faithful QA
Kant merge: "Science is organized knowledge. Wisdom is organized life."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/31387/console)

@VinceMacBuche
Copy link
Member Author

OK, squash merging this PR

@VinceMacBuche VinceMacBuche force-pushed the bug_18317/support_source_package_in_rudder_inventory branch from 66f8d9f to 06f05f2 Compare October 22, 2020 08:59
@VinceMacBuche VinceMacBuche merged commit 06f05f2 into Normation:branches/rudder/6.2 Oct 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants