Djam/r11-builder-agent
1
0
Fork 0
mirror of https://tvoygit.ru/Djam/r11-builder-agent.git synced 2025-02-23 02:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add deps error to grep

Browse source
This commit is contained in:
HisShadow 2020-02-12 11:03:17 +03:00
parent 044a810771
commit 62e6c306e0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build-rpm.sh
View file

@ -257,7 +257,7 @@ arm_platform_detector
MAX_RETRIES=10
WAIT_TIME=60
RETRY_GREP_STR="You may need to update your urpmi database\|problem reading synthesis file of medium\|retrieving failed: |retrieval of"
RETRY_GREP_STR="You may need to update your urpmi database|problem reading synthesis file of medium|retrieving failed: |retrieval of|error while checking dependencies"
if [ "$rerun_tests" = 'true' ]; then
test_rpm
@ -281,7 +281,7 @@ do
# rc=${PIPESTATUS[0]}
try_rebuild=false
if [[ $rc != 0 && $retry < $MAX_RETRIES ]]; then
if grep -q "$RETRY_GREP_STR" $OUTPUT_FOLDER/root.log; then
if grep -qE "$RETRY_GREP_STR" $OUTPUT_FOLDER/root.log; then
try_rebuild=true
(( retry=$retry+1 ))
echo "--> Repository was changed in the middle, will rerun the build. Next try (${retry} from ${MAX_RETRIES})..."
@ -297,7 +297,7 @@ do
rc=${PIPESTATUS[0]}
try_rebuild=false
if [[ $rc != 0 && $retry < $MAX_RETRIES ]]; then
if grep -q "$RETRY_GREP_STR" $OUTPUT_FOLDER/root.log; then
if grep -qE "$RETRY_GREP_STR" $OUTPUT_FOLDER/root.log; then
try_rebuild=true
(( retry=$retry+1 ))
echo "--> Repository was changed in the middle, will rerun the build. Next try (${retry} from ${MAX_RETRIES})..."
@ -340,7 +340,7 @@ do
rc=${PIPESTATUS[0]}
try_rebuild=false
if [[ $rc != 0 && $retry < $MAX_RETRIES ]] ; then
if grep -q "$RETRY_GREP_STR" $OUTPUT_FOLDER/build.log.tmp; then
if grep -qE "$RETRY_GREP_STR" $OUTPUT_FOLDER/build.log.tmp; then
try_rebuild=true
(( retry=$retry+1 ))
echo "--> Repository was changed in the middle, will rerun the build. Next try (${retry} from ${MAX_RETRIES})..."