- unbreak fetching sources with urls

Changed files:
    builder.sh -> 1.377

diff --git a/builder.sh b/builder.sh
index 2197aefe65972b9bfe84cd27ac0c54a33dba5a7a..308054f172d8e9b64986cf497fc3f8f8aa0b7214 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -658,6 +658,7 @@ get_files()
                local get_files_cvs=""
                for i in "$@"; do
                        nc=$((nc + 1))
+                       local cvsup=0
                        SHELL_TITLE_PREFIX="get_files[$nc/$#]"
                        update_shell_title "$i"
                        local fp=`nourl "$i"`
@@ -725,8 +726,9 @@ get_files()
                                                FROM_DISTFILES=0
                                        fi
                                elif [ -z "$(src_md5 "$i")" -a "$NOCVS" != "yes" ]; then
-                                  get_files_cvs="$get_files_cvs $fp"
-                                       continue
+                                   get_files_cvs="$get_files_cvs $fp"
+                                       # we'll do cvs up later
+                                       cvsup=1
                                fi
 
                                if [ -z "$NOURLS" ] && [ ! -f "$fp" -o -n "$UPDATE" ] && [ "`echo $i | grep -E 'ftp://|http://|https://'`" ]; then
@@ -743,6 +745,10 @@ get_files()
                                        fi
                                fi
 
+                               if [ "$cvsup" = 1 ]; then
+                                       continue
+                               fi
+
                        fi
                        srcno=$(src_no $i)
                        if [ ! -f "$fp" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then