Fixes #7126: Add a new system variable for the \"rudder_directives\" bundle #917
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| SystemVariable(systemVariableSpecService.get("INPUTLIST"), Seq(inputs.distinct.mkString("\"", "\",\"", "\""))) | ||
| , SystemVariable(systemVariableSpecService.get("BUNDLELIST"), Seq(bundleSeq.map( _._2.name).mkString(", ", ", ", ""))) | ||
| , SystemVariable(systemVariableSpecService.get("RUDDER_DIRECTIVES_SEQUENCE"), | ||
| Seq(bundleSeq.map { case (promisee, bundle) => s""" "${promisee} usebundle => ${bundle.name};" """}.mkString( "\n")) |
There was a problem hiding this comment.
This should be promiser, not promisee. Promisee is a whole different concept in CFEngine. See http://syslog.me/2013/05/21/the-value-of-the-promisee-in-cfengine-promises/.
There was a problem hiding this comment.
this should indeed be called promiser
Plus, you have invalid quoting, the line should probably be
"${promiser}" usebundle => ${bundle.name};
|
PR updated |
fanf
force-pushed
the
arch_7126/add_a_new_system_variable_for_the_rudder_directives_bundle
branch
from
3aabc5c
to
1d1145a
Compare
| // We need to remove zero-length bundle name from the bundlesequence (like, if there is no ncf bundles to call) | ||
| // to avoid having two successives commas in the bundlesequence | ||
| val techniqueBundles = technique.bundlesequence.flatMap { bundle => | ||
| if(bundle.name.trim.size > 0) { | ||
| Some(bundle) | ||
| Some((technique, promisee, bundle)) |
There was a problem hiding this comment.
This should still be promiser
|
PR updated |
fanf
force-pushed
the
arch_7126/add_a_new_system_variable_for_the_rudder_directives_bundle
branch
from
1d1145a
to
c4eb79f
Compare
|
PR updated |
fanf
force-pushed
the
arch_7126/add_a_new_system_variable_for_the_rudder_directives_bundle
branch
from
c4eb79f
to
db0a3dd
Compare
ncharles
added a commit
that referenced
this pull request
Aug 31, 2015
…_for_the_rudder_directives_bundle Fixes #7126: Add a new system variable for the \"rudder_directives\" bundle
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/7126