Fixes an issue introduced by ad46d34581
Apparently, under some circumstances, rpkg will store the "repo name" as
only the path field when using HTTPS remotes. As a result, we were
incorrectly treating those paths as an SSH URI since they had no scheme
when parsed by urllib.parse.urlparse(). This resulted in the first part
of the path being treated as the "netloc" and being trimmed out. This
naturally meant that the lookup against Gitlab for the fork parent would
fail.
This patch adds a check to ensure that the git+ssh:// scheme is only
added if the repo_url starts with "git@".
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
We've identified most of the ways that this can fail and accounted for
them, so let's stop catching all errors and let them fail the execution
and get reported if they come up.
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
There are two valid forms of SSH protocol git remotes, but we were only
expecting the [git+]ssh:// form. The urllib.parse.urlparse() routine was
thus failing to determine the scheme and was treating the entire URL as
the path to pass to the Gitlab API. As a result, it was throwing a 404
exception that we were catching and ignoring.
This patch checks for a missing scheme component and if it finds one, it
transfers the remote into the other URL form for parsing purposes.
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
When validating the spelling of the package during cloning, decide based
on the program name whether to use the default namespace of CentOS RPMs,
or the namespace dedicated to CentOS SIGs.
Note that there is no reasonable way to deduce the specific SIG, so it
is required to give absolute path, e.g.,`‹SIG›/rpms/‹package›` when
cloning.
Signed-off-by: Matej Focko <mfocko@redhat.com>
Do not assume that the package name is second when validating the
spelling of the package name with a specified namespace.
This holds for CentOS itself as there is only one namespace in front of
the package, e.g., `rpms` or `modules`. However when using the
`centpkg-sig`, the packages reside under the SIGs' namespace adding
an additional layer which yields the `rpms` for second part of the path
instead of the package name.
Signed-off-by: Matej Focko <mfocko@redhat.com>
This is because we cannot confidently check if we are pushing
to a fork or not.
Instead give a warning, and proceed.
Signed-off-by: Troy Dawson <tdawson@redhat.com>
In RHEL 10, the internal branch names have dropped the extra .0
Additionally, there will now also be a rhel-X.0-beta branch.
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
Using `centpkg clone -a` results in a warning from git due to the URL
being redirected:
$ centpkg clone -a git
Cloning into 'git'...
warning: redirecting to https://gitlab.com/redhat/centos-stream/rpms/git.git/
...
Update anongiturl to point to the real URL for HTTP cloning. The
addition of the trailing slash does not raise a warning, so it may be
safely left off the URL.
Look up the parent repo of forks for the package name.
This requires the user to have a valid Gitlab API token in
their configuration. It will raise an error if it takes this
path and does not have permission.
Note that when https://gitlab.com/gitlab-org/gitlab/-/issues/361952
is fixed in Gitlab, the token will not be required in this case.
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
Recent changes on rpkg side require modification in centpkg too.
rpmdefines in rpkg had to be changed because of a safer way
of executing the 'rpm' command in the 'subprocess' python library
(without shell=True argument).
A related change in rpkg: https://pagure.io/rpkg/pull-request/620
Other tools depending on rpkg (rhpkg, fedpkg, centpkg, rfpkg) are
affected.
Example for fedpkg: https://pagure.io/fedpkg/pull-request/486
Signed-off-by: Ondrej Nosek <onosek@redhat.com>
