No package under FreeBSD

[jas01]

With FreeBSD bzip2 as part of the system, so it's not need to install
bzip2 package, and because this package doesn't exist the class go in
error if it try to install that package.

I put the change inside the mysqldump.pp I'm pretty sure that's not the correct way to do it (should be inside params.pp) but well I think it's the only os who have this difference, and...soon we going to use some hiera.yaml instead of this params.pp 😉

[sheenaajay]

@jas01 Thanks for submitting the PR. Could you please rebase the master, since it contains changes for acceptance test setup. Thank you.

[jas01]

Le 06/09/2019 à 03:31:31-0700, sheenaajay a écrit

@jas01 Thanks for submitting the PR. Could you please rebase the master, since it contains changes for acceptance test setup. Thank you.

Just did. Hope I did it correctly (first time I do this) Regards

[sheenaajay]

@jas01 Looks like rebase pulled down all commit from master to this branch.
Do you want to open a PR with the changes? Please let us know if you need any help or information. Thank you.

[jas01]

Le 11/09/2019 à 06:02:13-0700, sheenaajay a écrit

@jas01 Looks like rebase pulled down all commit from master to this branch. Do you want to open a PR with the changes? Please let us know if you need any help or information. Thank you. —

Well yes, I'm not familiar enough with github to understand what I suppose to do. I have already a pull request (obviously ;-) ). Why should I need another pull request ? Regards

[sheenaajay]

@jas01 depends on the setup the commands can change. Basically we use git rebase command to do rebase (git rebase puppetlabs/master (if puppetlabs is the upstream )) and push the changes to your branch.
If rebase is done if will have all changes to your master branch but not all the commits or changes from the master will be added to the PR.

Since its pulled all changes including the commits on the master to this PR it will throw an error during the merge.

You can try to do rebase again and see if the PR shows only your changes and commit,If it's not successful it better to open a new PR with your changes

[sheenaajay]

@jas01 Please let us know if the rebase command works. Happy to help you.

[jas01]

Le 13/09/2019 à 04:50:55-0700, sheenaajay a écrit

@jas01 Please let us know if the rebase command works. Happy to help you.

Well, I think I'm too stupid ;-).... I already did a rebase few time ago, github automatically relaunch the travis CI and it end up green. Anyway I just remake a rebase and currently it's indeed «rebase» over master from puppetlabs commit 9d5c73b (HEAD -> fix-bzip2-package, origin/fix-bzip2-package) Merge: b40098b 19fccec Author: jas01 <Use github> Date: Fri Sep 13 16:51:29 2019 +0200 Merge branch 'fix-bzip2-package' of github.com:jas01/puppetlabs-mysql into fix-bzip2-package commit b40098b Author: jas01 <Use github> Date: Tue Aug 27 16:52:43 2019 +0200 No package under FreeBSD With FreeBSD bzip2 as part of the system, so it's not need to install bzip2 package, and because this package doesn't exist the class go in error if it try to install that package. commit 277ff26 (puppetlabs/master, master) Merge: 5455568 aeaab9f Author: Michael T Lombardi (He/Him) <[email protected]> Date: Wed Sep 11 08:56:53 2019 -0500 Merge pull request #1230 from puppetlabs/FM-8406 FM-8406 add support on Debian10 So I hope it should be ok now.

[sheenaajay]

@jas01 can see 19 commits on this branch. Could you please do clean rebase and force push like you done with your other PR. Thank you.

[jas01]

Le 16/09/2019 à 06:11:34-0700, sheenaajay a écrit

@jas01 can see 19 commits on this branch. Could you please do clean rebase and force push like you done with your other PR. Thank you.

Hope this time it's ok. Sorry...for all those mistakes....first time I do something inside a project who as more than 1 commit for every 100 years ;-) Regards

[sheenaajay]