- cache_rpm_dump checks for rpm/rpmbuild errors

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

diff --git a/builder.sh b/builder.sh
index ca19874a9a95b4ff7f7ce3a7a931c68722018497..1f9b06c60d727633b59976acabf530d172a4fc61 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -3,18 +3,20 @@
 # $Id$
 # Exit codes:
 #      0 - succesful
-#      1 - help dispayed
+#      1 - help displayed
 #      2 - no spec file name in cmdl parameters
 #      3 - spec file not stored in repo
 #      4 - some source, patch or icon files not stored in repo
 #      5 - package build failed
+#      6 - spec file with errors
 
 # Notes (todo):
 #      - builder -u fetches current version first
 #      - tries to get new version from distfiles without new md5
 #      - after fetching new version doesn't update md5
-#      - doesn't get sources for specs with %include  /usr/lib/rpm/macros.python
+#      - doesn't get sources for specs with %include /usr/lib/rpm/macros.python
 #        when there's no rpm-pythonprov (rpm's fault, but it's ugly anyway)
+#      - as above with %include /usr/lib/rpm/macros.perl and no rpm-perlprov
 
 VERSION="\
 Build package utility from PLD CVS repository
@@ -112,8 +114,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
        [--with/--without <feature>] [--define <macro> <value>] <package>[.spec]
 
        -5, --update-md5
-                       - update md5 comments in spec, implies -nd
-       -a5, --add-md5  - add md5 comments to URL sources, implies -nc -nd
+                       - update md5 comments in spec, implies -nd -ncs
+       -a5, --add-md5  - add md5 comments to URL sources, implies -nc -nd -ncs
        -D, --debug     - enable script debugging mode,
        -V, --version   - output builder version
        -a, --as_anon   - get files via pserver as cvs@$CVS_SERVER,
@@ -188,15 +190,27 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 "
 }
 
-rpm_dump () {
+cache_rpm_dump () {
+   rpm_dump_cache=`
        case "$RPMBUILD" in
        rpm )
-               rpm -bp --define 'prep %dump' $BCOND $SPECFILE 2>&1 
+               rpm -bp --nodeps --define 'prep %dump' $BCOND $SPECFILE 2>&1 
                ;;
        rpmbuild )
-               rpmbuild --define 'prep %dump' $BCOND $SPECFILE 2>&1 
+               rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1 
                ;;
-       esac
+       esac`
+    if [ $? -ne 0 ]; then
+        echo $rpm_dump_cache
+       exit 6
+    fi
+}
+
+rpm_dump () {
+    if [ -z "$rpm_dump_cache" ] ; then
+        echo "internal error: cache_rpm_dump not called!" 1>&2
+    fi
+    echo "$rpm_dump_cache"
 }
 
 parse_spec()
@@ -207,6 +221,9 @@ parse_spec()
     fi
 
     cd $SPECS_DIR
+
+    cache_rpm_dump
+
     if [ "$NOSRCS" != "yes" ]; then
        SOURCES="`rpm_dump | awk '/SOURCEURL[0-9]+/ {print $3}'`"
     fi
@@ -434,6 +451,15 @@ get_files()
            fi
        fi
        for i in $GET_FILES; do
+           if [ -n "$UPDATE5" ]; then
+               if [ -n "$ADD5" ]; then
+                   [ `nourl $i` = "$i" ] && continue
+                   grep -qiE '^#[      ]*Source'$(src_no $i)'-md5[     ]*:' $SPECS_DIR/$SPECFILE && continue
+               else
+                   grep -qiE '^#[      ]*Source'$(src_no $i)'-md5[     ]*:' $SPECS_DIR/$SPECFILE || continue
+               fi
+           fi
+           FROM_DISTFILES=0
            if [ ! -f `nourl $i` ] || [ $ALWAYS_CVSUP = "yes" ]; then
                if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
                    echo "Warning: no URL given for $i"
@@ -446,10 +472,11 @@ get_files()
                    fi
                    target=$(nourl "$i")
                    url=$(distfiles_url "$i")
-                   if [ `echo $url | grep -E '^(\.|/)'` ] ; then
+                   if [ `echo $url | grep -E '^(\.|/)'` ]; then
                        ${GETLOCAL} $url $target
                    else
-                       if [ -z "$NOMIRRORS" ] ; then
+                       FROM_DISTFILES=1
+                       if [ -z "$NOMIRRORS" ]; then
                            url="`find_mirror "$url"`"
                        fi
                        ${GETURI} -O "$target" "$url" || \
@@ -458,8 +485,8 @@ get_files()
                            fi
                        test -s "$target" || rm -f "$target"
                    fi
-               elif [ -z "$(src_md5 "$i")" ] && \
-                    ( [ -z "$NOCVS" ] || echo $i | grep -qvE '(ftp|http|https)://' ); then
+               elif [ -z "$(src_md5 "$i")" -a "$NOCVS" != "yes" ] && \
+                       ( echo $i | grep -qvE '(ftp|http|https)://' ); then
                    result=1
                    retries_counter=0
                    while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
@@ -478,7 +505,7 @@ get_files()
                fi
 
                if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
-                   if [ -z "$NOMIRRORS" ] ; then
+                   if [ -z "$NOMIRRORS" ]; then
                        im="`find_mirror "$i"`"
                    else
                        im="$i"
@@ -507,6 +534,21 @@ get_files()
                                $SPECS_DIR/$SPECFILE
            fi
 
+           if good_md5 "$i"; then
+               :
+           elif [ "$FROM_DISTFILES" = 1 ]; then
+               # wrong md5 from distfiles: remove the file and try again
+               # but only once ...
+               echo "MD5 sum mismatch. Trying full fetch."
+               FROM_DISTFILES=2
+               rm -f $target
+               ${GETURI} -O "$target" "$url" || \
+                   if [ `echo $url | grep -E 'ftp://'` ]; then
+                       ${GETURI2} -O "$target" "$url"
+                   fi
+               test -s "$target" || rm -f "$target"
+           fi
+
            if good_md5 "$i"; then
                :
            else
@@ -708,6 +750,7 @@ nourl()
 {
     echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
 }
+
 #---------------------------------------------
 # main()
 
@@ -721,12 +764,14 @@ while test $# -gt 0 ; do
        -5 | --update-md5 )
            COMMAND="get";
            NODIST="yes"
+           NOCVSSPEC="yes"
            UPDATE5="yes"
            shift ;;
        -a5 | --add-md5 )
            COMMAND="get";
            NODIST="yes"
            NOCVS="yes"
+           NOCVSSPEC="yes"
            UPDATE5="yes"
            ADD5="yes"
            shift ;;
@@ -816,10 +861,10 @@ while test $# -gt 0 ; do
            TAG_VERSION="no"
            shift;;
        -U | --update )
+           COMMAND="get"
            UPDATE="yes"
            NODIST="yes"
            UPDATE5="yes"
-           COMMAND="get"
            shift ;;
        -u | --try-upgrade )
            TRY_UPGRADE="1"; shift ;;