Skip to content

(PDOC-224) Handle --emit-json(-stdout) again#162

Merged
eputnam merged 1 commit intopuppetlabs:masterfrom
ekohl:fix-emit-output
Mar 1, 2018
Merged

(PDOC-224) Handle --emit-json(-stdout) again#162
eputnam merged 1 commit intopuppetlabs:masterfrom
ekohl:fix-emit-output

Conversation

@ekohl
Copy link
Copy Markdown
Contributor

@ekohl ekohl commented Mar 1, 2018

No description provided.

raise RuntimeError, "Invalid format #{options[:format]}. Please select 'json' or 'markdown'."
end
elsif options[:emit_json] || options[:emit_json_stdout]
generate_options[:json] = true
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

also need to add generate_options[:path] = options[:emit_json] if emit_json is used.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

updated

@ekohl ekohl force-pushed the fix-emit-output branch from 4589a41 to 9728d10 Compare March 1, 2018 17:28
@eputnam
Copy link
Copy Markdown
Contributor

eputnam commented Mar 1, 2018

@ekohl ++

@eputnam eputnam merged commit e18217b into puppetlabs:master Mar 1, 2018
@eputnam eputnam added the bugfix label Mar 1, 2018
@ekohl ekohl deleted the fix-emit-output branch March 1, 2018 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants