Eupspkg patch on mariadb doesn't apply cleanly

mjuric / conda-lsst

Building Conda packages for the LSST stack

4 stars 8 forks source link

Eupspkg patch on mariadb doesn't apply cleanly #58

Closed mareuter closed 8 years ago

mareuter commented 8 years ago

The eupspkg.cfg patch for mariadb does not apply cleanly for OSX and RHEL6 or newer. It works on RHEL5 only. The RHEL7 build shows:

HEAD is now at fe7e7b2... Merge branch 'tickets/DM-5595'
patching file ups/eupspkg.cfg.sh
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file ups/eupspkg.cfg.sh.rej

and the OSX one is the same except the asm-compat.patch is applied cleanly. The patch application failure stops the build.

mareuter commented 8 years ago

Looks like this is due to patches being applied to files that already contain the contents of the patch.

mareuter commented 8 years ago

This PR addresses the issue for mariadb and mariadbclient packages.