PR#9232: Mass rebuild: Make sure we're on the master branch no matter the default - releng

releng

#9232 Mass rebuild: Make sure we're on the master branch no matter the default

Merged 4 years ago by cverna. Opened 4 years ago by churchyard.

churchyard/releng mass_rebuild_only_master into master

Mass rebuild: Make sure we're on the master branch no matter the default

Miro Hrončok • 4 years ago

a850a4c

scripts/mass-rebuild.py

file modified

+1 -1

		`@@ -112,7 +112,7 @@`
		`continue`

		`# Check out git`
		`- fedpkgcmd = ['fedpkg', '--user', 'releng', 'clone', name]`
		`+ fedpkgcmd = ['fedpkg', '--user', 'releng', 'clone', '--branch', 'master', name]`
		`print('Checking out %s' % name)`
		`if runme(fedpkgcmd, 'fedpkg', name, enviro):`
		`continue`

churchyard commented 4 years ago

Pagure dist-git repos can have different default branches than master,
but during the mass rebuild, we always want to use the master branch.

This clones the repository on master even if it is not the default,
and it also fails (=skips the package) if there is no master branch.

This prevents cases like https://pagure.io/releng/issue/9213

till commented on line 6 of scripts/mass-rebuild.py 4 years ago

Not sure if it makes a difference in practice but the --branch flag should be specified before the name argument.

fedpkgcmd = ['fedpkg', '--user', 'releng', 'clone', '--branch', 'master', name]

Edited 4 years ago by till

churchyard commented 4 years ago

Why?

till commented 4 years ago

Because it is an option to the clone command and name is an argument and the convention is to specify options before arguments (see the manpage for example).

churchyard commented 4 years ago

I don't think it matters at all, but done.

rebased onto 3756ca1f7f28dabd0d6deb6e883215497b7d6225

4 years ago

rebased onto c24dd2dcdbd5783a11cc929c1e97156dac281783

4 years ago

churchyard commented 4 years ago

Rebased.

rebased onto b0eb90e78d890c1603ecaa4d1d9a229adddab518

4 years ago

rebased onto b0eb90e78d890c1603ecaa4d1d9a229adddab518

4 years ago