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.

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

Jb57663 #323

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jb57663 #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b31d16
[sdk-manage] Do not let curl ignore HTTP errors
martyone Mar 4, 2022
8e8d232
[sdk-manage] Let curl consider netrc by default. JB#57663
martyone Mar 4, 2022
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
2 changes: 2 additions & 0 deletions sdk-setup/src/sdk-assistant
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Usage:
using the image at <URL>. In case of a new
target, an appropriate tooling will be selected
automatically unless overridden with '--tooling'.
Use netrc to supply your credentials in case of
an <URL> which requires authentication.
Automatic creation of the default build target
snapshot may be suppressed with the
'--no-snapshot' option.
Expand Down
11 changes: 10 additions & 1 deletion sdk-setup/src/sdk-manage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,14 @@ fi
# unconditional, so that eventual issues are discovered ASAP.
sb2() ( cd; command sb2 "$@" )

curl() {
local netrc=$HOST_HOME/_netrc
[[ -e $netrc ]] || netrc=$HOST_HOME/.netrc
[[ -e $netrc ]] || netrc=

command curl --netrc-optional ${netrc:+--netrc-file "$netrc"} "$@"
}

print_array() {
local array=("$@")
declare -p array |sed 's/^[^=]*=//'
Expand Down Expand Up @@ -269,7 +277,7 @@ download() {
trap 'return 1' INT TERM HUP

echo >&2 "Downloading '${url##*/}'"
curl "$url" -o "$orig_downloaded_file"
curl --fail "$url" -o "$orig_downloaded_file"
curl_status=$?

if [[ $curl_status -eq 0 ]] ; then
Expand Down Expand Up @@ -2779,6 +2787,7 @@ fi
MER_TARGETS=/srv/mer/targets
MER_TOOLINGS=/srv/mer/toolings
HOST_TARGETS=/host_targets
HOST_HOME=/host_home
SBOX2DIR=${HOME}/.scratchbox2
TARGETS_XML=${HOST_TARGETS}/targets.xml
USER_TARGETS_REPOSITORY=${HOST_TARGETS}/targets.repository
Expand Down