diff options
| -rw-r--r-- | scripts/common.sh | 10 | ||||
| -rwxr-xr-x | scripts/osmocom-latest-packages.sh | 3 | ||||
| -rwxr-xr-x | scripts/osmocom-nightly-packages.sh | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/scripts/common.sh b/scripts/common.sh index bf24fc4..6d91101 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -89,6 +89,16 @@ osmo_git_last_tags() { echo "$ret" | cut -d/ -f 3 } +# Pass all arguments to "git clone", but write the current date and time before the clone and on failure. +# This helps analyzing errors with git.osmocom.org (OS#4083). +osmo_git_clone_date() { + date "+%Y-%m-%d %H:%M:%S" + if ! git clone "$@"; then + date "+%Y-%m-%d %H:%M:%S" + exit 1 + fi +} + # Print the subdirectory of the repository where the source lies (configure.ac etc.). # Print nothing when the source is in the topdir of the repository. osmo_source_subdir() { diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 1074294..509bced 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -1,4 +1,5 @@ #!/bin/sh +. "$(dirname "$0")/common.sh" . "$(dirname "$0")/common-obs.sh" # requirements @@ -54,7 +55,7 @@ checkout() { if [ "$project" = "limesuite" ]; then [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" else - [ -d "$project" ] || git clone "https://git.osmocom.org/$project" + [ -d "$project" ] || osmo_git_clone_date "https://git.osmocom.org/$project" fi cd "$project" git fetch diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 172e4e0..1c76cc1 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -1,4 +1,5 @@ #!/bin/bash +. "$(dirname "$0")/common.sh" . "$(dirname "$0")/common-obs.sh" # requirements @@ -68,9 +69,9 @@ checkout() { cd "$REPO" if [ -n "$branch" ] ; then - git clone "$url/$name" -b "$branch" + osmo_git_clone_date "$url/$name" -b "$branch" else - git clone "$url/$name" + osmo_git_clone_date "$url/$name" fi cd - |