PR#4058: Bypass old hooks rather than using non-existing symlinks - pagure

pagure

#4058 Bypass old hooks rather than using non-existing symlinks

Merged 5 years ago by pingou. Opened 5 years ago by pingou.

bypass_old_hooks into master

Adjust a little bit the information message

Pierre-Yves Chibon • 5 years ago

0055c09

When calling the hooks, ignore the samples that git inserts

Pierre-Yves Chibon • 5 years ago

e0fd667

Bypass old hooks rather than using non-existing symlinks

Pierre-Yves Chibon • 5 years ago

4937c4e

pagure/hooks/__init__.py

file modified

+11 -5

		`@@ -427,7 +427,10 @@`
		`stdin = stdin.encode("utf-8")`

		`if debug:`
		`- print("Running legacy hooks with args: %s, stdin: %s" % (args, stdin))`
		`+ print(`
		`+ "Running legacy hooks (if any) with args: %s, stdin: %s"`
		`+ % (args, stdin)`
		`+ )`

		`for hook in os.listdir(hookdir):`
		`# This is for legacy hooks, which create symlinks in the form of`
		`@@ -435,10 +438,13 @@`
		`if hook.startswith(hooktype + "."):`
		`hookfile = os.path.join(hookdir, hook)`

		`- # Determine if this is an actual hook, or if it's a remnant`
		`- # from a hook that was installed before it was moved to the`
		`- # runner system.`
		`- if os.path.realpath(hookfile) == pagure.lib.query.HOOK_DNE_TARGET:`
		`+ # By-pass all the old hooks that pagure may have created before`
		`+ # moving to the runner architecture`
		`+ if hook in pagure.lib.query.ORIGINAL_PAGURE_HOOK:`
		`+ continue`
		`+`
		`+ if hook.endswith(".sample"):`
		`+ # Ignore the samples that Git inserts`
		`continue`

		`# Execute`

pagure/lib/query.py

file modified

+17 -3

		`@@ -69,9 +69,23 @@`
		`REDIS = None`
		`PAGURE_CI = None`
		`_log = logging.getLogger(__name__)`
		`- # The target for hooks migrated to the Runner system, to be able to detect`
		`- # whether a hook was migrated without having to open and read the file`
		`- HOOK_DNE_TARGET = "/does/not/exist"`
		`+ # List of all the possible hooks pagure could generate before it was moved`
		`+ # to the runner architecture we now use.`
		`+ # This list is kept so we can ignore all of these hooks.`
		`+ ORIGINAL_PAGURE_HOOK = [`
		`+ "post-receive.default",`
		`+ "post-receive.fedmsg",`
		`+ "post-receive.irc",`
		`+ "post-receive.mail",`
		`+ "post-receive.mirror",`
		`+ "post-receive.pagure",`
		`+ "post-receive.pagure-requests",`
		`+ "post-receive.pagure-ticket",`
		`+ "post-receive.rtd",`
		`+ "pre-receive.pagure_no_new_branches",`
		`+ "pre-receive.pagureforcecommit",`
		`+ "pre-receive.pagureunsignedcommit",`
		`+ ]`


		`def get_repotypes():`

pagure/lib/tasks.py

file modified

+1 -3

		`@@ -605,7 +605,6 @@`
		`raise Exception("Project is already on repoSpanner")`

		`# Make sure that no non-runner hooks are enabled for this project`
		`- compatible_targets = [pagure.lib.query.HOOK_DNE_TARGET]`
		`incompatible_hooks = []`
		`for repotype in pagure.lib.query.get_repotypes():`
		`path = project.repopath(repotype)`
		`@@ -620,8 +619,7 @@`
		`if hook.endswith(".sample"):`
		`# Ignore the samples that Git inserts`
		`continue`
		`- hookfile = os.path.join(hookpath, hook)`
		`- if os.path.realpath(hookfile) not in compatible_targets:`
		`+ if hook not in pagure.lib.query.ORIGINAL_PAGURE_HOOK:`
		`incompatible_hooks.append((repotype, hook))`

		`if incompatible_hooks:`

pingou commented 5 years ago

When we moved to the runner architecture, we changed the way hooks are
called. During this move, we changed all of our existing hooks into
non-existing symlinks pointing to '/does/not/exists' and we were checking
if the files on disk were matching this target or not.
This created a few issue when releasing pagure:
- python setup.py sdist resolve symlinks as part of the archive creation
process
Reported in https://pagure.io/pagure/issue/3782
- Building pagure failed on some system because these symlinks does not
exist
Reported in https://pagure.io/pagure/issue/3706

So in this commit we are dropping the use of symlink and just making
pagure ignore all the hook it could have created.

Fixes https://pagure.io/pagure/issue/3782
Fixes https://pagure.io/pagure/issue/3706

Signed-off-by: Pierre-Yves Chibon pingou@pingoured.fr

1 new commit added