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

Fix #278 Don't require additional args when --inputs is specified #297

Merged
merged 1 commit into from Nov 27, 2012

Conversation

Projects
None yet
2 participants
@r4um
Contributor

r4um commented Nov 27, 2012

  • Fix #278 Don't require additional args when --inputs is specified
  • --inputs only valid with -s dir
  • Strip lines when reading from file from --inputs
* Fix #278 Don't require additional args when --inputs is specified
* --inputs only valid with -s dir
* Strip lines when reading from file from --inputs
@@ -490,7 +494,7 @@ def validate
"files and directories. For '-s gem' you would pass a one" \
" or more gems to package from. As a full example, this " \
"will make an rpm of the 'json' rubygem: " \
"`fpm -s gem -t rpm json`")
"`fpm -s gem -t rpm json`") unless @command.input_type == "dir" and @command.inputs

This comment has been minimized.

@jordansissel

jordansissel Nov 27, 2012

Owner

hmm, this conditional belongs in the first arg to mandatory, I'll fix that.

jordansissel added a commit that referenced this pull request Nov 27, 2012

Merge pull request #297 from r4um/fix_278
Fix #278 Don't require additional args when --inputs is specified

@jordansissel jordansissel merged commit fb5955e into jordansissel:master Nov 27, 2012

1 check passed

default The Travis build passed
Details

@r4um r4um referenced this pull request Nov 29, 2012

Closed

using --inputs fails to work #211

prof-milki pushed a commit to prof-milki/xpm that referenced this pull request Dec 18, 2014

jls
Merge pull request jordansissel#297 from r4um/fix_278
Fix jordansissel#278 Don't require additional args when --inputs is specified

prof-milki pushed a commit to prof-milki/xpm that referenced this pull request Dec 27, 2014

Merge pull request jordansissel#297 from r4um/fix_278
Fix jordansissel#278 Don't require additional args when --inputs is specified

jordansissel added a commit that referenced this pull request Apr 24, 2015

Merge pull request #297 from r4um/fix_278
Fix #278 Don't require additional args when --inputs is specified

jordansissel added a commit that referenced this pull request Jun 20, 2016

Merge pull request #297 from r4um/fix_278
Fix #278 Don't require additional args when --inputs is specified
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment