Changeset 743


Ignore:
Timestamp:
May 26, 2009, 3:48:48 PM (15 years ago)
Author:
joergs
Message:

fixed check for required building

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dassbuild/svn_build_prepare.sh

    r741 r743  
    8282            SVN_BUILD_RELEASE=${SVN_BUILD_RELEASE}p
    8383            REBUILD="yes"
    84         else
    85             # check if RPM has been built already
    86             # TODO: this check is broken for OpenSUSE build service,
    87             #       because version is changed later on
    88             EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-${VERSION}-${SVN_BUILD_RELEASE}.*.rpm
    89             if [ -f "$EXPECTED_DEST_RPM_FILENAME" ]; then
    90                 echo
    91                 echo "Build of \"${PACKAGE}\" unnecessary. Current RPM already at " $EXPECTED_DEST_RPM_FILENAME
    92                 echo
    93                 exit 1
    94             fi
    9584        fi
    9685
     
    10291        fi
    10392        echo "SVN_BUILD_RELEASE: $SVN_BUILD_RELEASE"
    104        
     93        echo "VERSION: $VERSION"
     94
     95        #
     96        # check, if RPM should be build again
     97        #
     98        if [ -z "$REBUILD" ]; then
     99            # check if RPM has been built already
     100            # TODO: is this useful for OpenSUSE Build Service?
     101            EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-${VERSION}-*.*.rpm
     102            echo "EXPECTED_DEST_RPM_FILENAME: $EXPECTED_DEST_RPM_FILENAME"
     103            if find $EXPECTED_DEST_RPM_FILENAME ; then
     104                echo
     105                echo "Build of \"${PACKAGE}\" unnecessary."
     106                echo "Current RPM already at " $EXPECTED_DEST_RPM_FILENAME
     107                echo
     108                exit 1
     109            fi
     110        fi
     111
    105112        printf "adding subversion changelog: "
    106113        # changelog header
Note: See TracChangeset for help on using the changeset viewer.