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

copy config files external to source #1379

Merged
merged 1 commit into from Jul 21, 2017

Conversation

Projects
None yet
3 participants
@josephholsten
Collaborator

josephholsten commented Jul 21, 2017

rebased #860

@jordansissel

This comment has been minimized.

Owner

jordansissel commented Jul 21, 2017

Thank you for rebasing this!

Looking at the change, it seems like this only covers the rpm target. It's also a stretch (this is ok) to have something besides the -s source provide content for a package.

I like the idea, and I would like to see this expanded to all package types.

I think we can merge as-is and work on moving the code so that fpm can do this for all package types later.

@jordansissel jordansissel merged commit 783b06f into master Jul 21, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@josephholsten

This comment has been minimized.

Collaborator

josephholsten commented Jul 21, 2017

should we stick with the config_files name? also will need doc

@josephholsten josephholsten deleted the new-860 branch Jul 21, 2017

jordansissel added a commit that referenced this pull request Jul 29, 2017

Restore prior --config-files behavior
PR #1379/#860 introduced a new behavior for --config-files that fetches
config files from the local filesystem. The prior behavior was to
require these files to be provided by the source package (`--source`
flag).

This patch makes a hybrid solution which does, for any given
`--config-files foo` flag:

* does the path `foo` already exist in the staging area? Do nothing.
This means the package source (`-s gem` for example) provided this file.
* or, does the path `foo` exist in the local filesystem? If so, copy it
into the staging area.
* otherwise, consider this to be an error that the --config-files
setting cannot find the file, and fpm will fail with an error.

jordansissel added a commit that referenced this pull request Jul 29, 2017

Restore prior --config-files behavior
PR #1379/#860 introduced a new behavior for --config-files that fetches
config files from the local filesystem. The prior behavior was to
require these files to be provided by the source package (`--source`
flag).

This patch makes a hybrid solution which does, for any given
`--config-files foo` flag:

* does the path `foo` already exist in the staging area? Do nothing.
This means the package source (`-s gem` for example) provided this file.
* or, does the path `foo` exist in the local filesystem? If so, copy it
into the staging area.
* otherwise, consider this to be an error that the --config-files
setting cannot find the file, and fpm will fail with an error.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment