Fix repo refresh #199
Fix repo refresh #199
Conversation
…ystems (ondrej/php5, ondrej/php5-5.6, and others are now deprecated)
|
I guess you did branch off from a branch that did hold the old history from before your commits were squashed when merging #190. In general I recommend to always have master/develop of a fork in sync with the upstrema repo, but never do commits to it, then use topic branches for PRs to the upstream repo and when opening new PRs, re-sync master/develop from upstream and branch off a new topic branch from that. Anyway, from a mayflower/puppet-php perspective it's perfectly fine to squash all these commits together into one when merging. |
| @@ -27,7 +27,12 @@ | |||
| } | |||
|
|
|||
| if $::operatingsystem == 'Ubuntu' { | |||
| ensure_packages(["${php::globals::package_prefix}xml"]) | |||
| if ( ! defined(Package["${php::globals::package_prefix}xml"])) { | |||
There was a problem hiding this comment.
is there a way around that? using defined would really be a last resort measurement
There was a problem hiding this comment.
using ensure_packages from stdlib might be in order here.
|
@mmoll Hmm.. I tried squashing these to one commit but I am getting an error: Cannot 'squash' without a previous commit |
|
I wonder if I'm better off re-forking mayflower-php master and redoing this PR? I can't seem to squash the commits. I suppose I can leave it for now. |
|
@mmoll I think ensure_packages might take a hash of resources. Going to see if I can clean this up. |
|
you can always grab the current mayflower master and force push it into the master branch of your fork and then cherry-pick your commit into another branch and force push into the fix_repo_refresh of your fork. |
|
OK I've sorted the ugly if ( ! defined(Package[...])) stuff. Re-checking stdlib, it does take resources in a hash after the package list which is ace. So I've amended the PR to suit. |
|
merged, thanks @tdm4! |
Hi, I found an issue where it takes 2 runs of puppet to fix the package installation. Now the packages correctly require Class[::apt::update] so they install correctly the first time.