Put the sed insert statement back in to the output.

[kaithar]

Turns out that commit a369c88 (merged in PR #18368) make a bad change to modules/makeconf.py where it removed the insertion part of a '/regex/ i\text' construction.

Since this bug's pretty old, Nov 2014, I'll be sending backport PRs momentarily for 2014.7 and 2015.2 branches.

[jfindlay]

@kaithar, thanks for the fix. It is only necessary to submit fixes to the oldest release branch as the branches are merged forward regularly. This also helps to keep our git history a little simpler, see https://docs.saltstack.com/en/latest/topics/development/contributing.html#which-salt-branch.

[jfindlay]

Do you mind if I close this and the pull request against 2015.2?

[kaithar]

@jfindlay nod I tried doing it this way as an experiment, following the back port instructions on that page.
I targeted develop primarily because that's what I'm running and this bug was providing an obstruction in my plans for the day. I made the backports because I'd have asked for them anyway. Trying to be helpful :)

[kaithar]

@jfindlay sure, if it's not going to take too long to promote up to develop 😸

[jfindlay]

@kaithar, no problem. I'll go ahead and merge all these since I've created more work complaining about it than would have been saved. I'm always trying to reevaluate how to better message our workflow, so if you have any comments, please share them, thanks, gentoo ftw, btw!

[kaithar]

@jfindlay heh, seems to be an irony. Thanks for merging.
(Edited to remove annoying redundancy)