Skip to content

Improve error handling when forking fails #457

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 4, 2025
Merged

Improve error handling when forking fails #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions _common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,11 @@ log-warn() (
colorize "err" "WARNING" "[warn] $*"
)

log-error() (
set +x
colorize "err" "ERROR" "[error] $*"
)

debug_osc() (
set +x
log-debug "### osc $*"
Expand Down
11 changes: 9 additions & 2 deletions os-autoinst-obs-auto-submit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ make_obs_submit_request() {
}

make_git_submit_request() {
local package=$1 target=$2 version=$3 branch=$4 forked_repo=''
local package=$1 target=$2 version=$3 branch=$4 forked_repo='' fork_rc=0
title="Update to $version"
description="Automatic submission via https://github.com/os-autoinst/scripts/blob/master/os-autoinst-obs-auto-submit"

Expand All @@ -101,7 +101,14 @@ make_git_submit_request() {
# `git-obs login add --url=https://src.opensuse.org obs --set-as-default --user=… --token=…`
# For `git push` to work (done below) you need to deploy an SSH key on the Gitea instance.
# Checkout https://opensuse-commander.readthedocs.io/en/latest/git-obs-quickstart.html for details.
forked_repo=$($git_obs repo fork "pool/$package" 2>&1 > /dev/null | perl -ne 'print for /Fork .*: (.*)/g')
fork_output=$($git_obs repo fork "pool/$package" 2>&1 > /dev/null) || fork_rc=$?
forked_repo=$(echo "$fork_output" | perl -ne 'print for /Fork .*: (.*)/g')
if [[ $fork_rc != 0 ]] || [[ -z $forked_repo ]]; then
log-error "Unable to create fork, $git_obs exited with return code $fork_rc and output:\n$fork_output"
[[ -e $HOME/.config/tea/config.yml ]] \
|| log-info "Be sure you have followed https://opensuse-commander.readthedocs.io/en/latest/git-obs-quickstart.html"
return 1
fi

# enter a working copy of the fork and switch to the branch the submission should be based on
$git_obs repo clone --no-ssh-strict-host-key-checking "$forked_repo" || return $?
Expand Down