- don't try to branch remote files (code taken from tag routine)

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index e766df5ed2d975498ea94ad760e961f4553781ec..58e90656872e663fd5d82079db481a6693df20e9 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -93,7 +93,7 @@ FAIL_IF_NO_SOURCES="yes"
 # let get_files skip over files which are present to get those damn files fetched
 SKIP_EXISTING_FILES="no"
 
-TRY_UPGRADE=
+TRY_UPGRADE=""
 # should the specfile be restored if upgrade failed?
 REVERT_BROKEN_UPGRADE="yes"
 
@@ -445,7 +445,7 @@ get_icons()
                return
        fi
 
-       rpm_dump_cache="kalasaba" NODIST="yes" UPDATE5= get_files $ICONS
+       rpm_dump_cache="kalasaba" NODIST="yes" get_files $ICONS
 }
 
 parse_spec()
@@ -1147,7 +1147,9 @@ build_package()
                        eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE"
                        eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t0.1/' $SPECFILE"
                        parse_spec;
-                       NODIST="yes" UPDATE5="yes" get_files $SOURCES $PATCHES;
+                       NODIST="yes" get_files $SOURCES $PATCHES;
+                       UPDATE5="yes" update_md5 $SOURCES
+
                        unset TOLDVER TNEWVER TNOTIFY
                fi
        fi
@@ -2028,6 +2030,13 @@ case "$COMMAND" in
                if [ -n "$SPECFILE" ]; then
                        get_spec;
                        parse_spec;
+                       # don't fetch sources from remote locations
+                       new_SOURCES=""
+                       for file in $SOURCES; do
+                               [ -n "`src_md5 $file`" ] && continue
+                               new_SOURCES="$new_SOURCES $file"
+                       done
+                       SOURCES="$new_SOURCES"
                        get_files $SOURCES $PATCHES
                        check_md5 $SOURCES
                        branch_files $TAG $SOURCES $PATCHES $ICONS