Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mail-filter/spamassassin: Update docs and warn about SQL schema changes #10285

Closed
wants to merge 1 commit into from

Conversation

Philippe23
Copy link
Contributor

Pull patches from upstream to address AWL + TxRep SQL schema changes
that were introduced in 3.4.2, but we're documented in it's initial
release.

Upstream-bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7631
Bug: https://bugs.gentoo.org/666576
Package-Manager: Portage-2.3.49, Repoman-2.3.11

@gentoo-bot
Copy link

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Areas affected: ebuilds
Packages affected: mail-filter/spamassassin

mail-filter/spamassassin: @Philippe23, bug[at]mejor.pl, @orlitzky, @gentoo/proxy-maint

Linked bugs

Bugs linked: 666576

Missing GCO sign-off

Please read the terms of Gentoo Certificate of Origin and acknowledge them by adding a sign-off to all your commits.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. no signoff One or more commits do not indicate GCO sign-off. labels Oct 28, 2018
@Philippe23
Copy link
Contributor Author

Added "Signed-off-by" tag.

Copy link
Contributor

@Whissi Whissi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please show elog only when we detect an upgrade.


if use mysql || use postgres ; then
elog
elog 'If you used AWL before 3.4.2, the SQL schema has changed.'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do that better. Please show that only when we detect an upgrade. Use something like

        local _v
        for _v in ${REPLACING_VERSIONS}; do
                if ! ver_test "${_v}" -gt "3.4.2-r3"; then
                        elog ...

                        # show this only once
                        break
                fi
        done

Pull patches from upstream to address AWL + TxRep SQL schema changes
that were introduced in 3.4.2, but we're documented in it's initial
release.

Upstream-bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7631
Bug: https://bugs.gentoo.org/666576
Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep@parallaxshift.com>
@Philippe23
Copy link
Contributor Author

Changed to ...

	if use mysql || use postgres ; then
		local _awlwarn=0
		local _v
		for _v in ${REPLACING_VERSIONS}; do
			if ! ver_test "${_v}" -gt "3.4.2-r3"; then
				_awlwarn=1
				break
			fi
		done
		if [[ ${_awlwarn} == 1 ]] ; then
			ewarn
			ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.'
			ewarn 'You will need to manually ALTER your tables for them to'
			ewarn 'continue working.  See the UPGRADE documentation for'
			ewarn 'details.'
			ewarn
		fi
	fi

Upgrade to ewarn since they'll only get one chance to notice it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. no signoff One or more commits do not indicate GCO sign-off. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
3 participants