On Thu, 2017-06-08 at 14:30 -0600, InvalidPath wrote: > @Bowl here's another attempt.. lemme know your thoughts sir. I think something odd is happening in the patch still - it seems to be creating a production.ini, a 0001-Combined-staging-and-production- template-files.patch, a 0001-Egg-changes.patch, renaming a production.ini to production.ini.j2 (this won't cleanly apply to the git tree since no production.ini exists there), and then deleting and recreating production.ini.j2. The patch should only mention three paths: roles/bodhi2/base/templates/production.ini.j2 roles/bodhi2/base/templates/staging.ini.j2 roles/bodhi2/base/tasks/main.yml The patch shouldn't be creating patch files, and shouldn't be deleting and recreating production.ini.j2. Make sure you have a clean git history (i.e., there should only be one commit on your branch for this, and it should only modify production.ini.j2 and main.yml, and should delete staging.ini.j2). Then you can use git format-patch to generate a patch for that commit.
Attachment:
signature.asc
Description: This is a digitally signed message part
_______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
