Changeset 743 for trunk

Timestamp:

May 26, 2009, 3:48:48 PM (16 years ago)

Author:

joergs

Message:

fixed check for required building

File:

• trunk/dassbuild/svn_build_prepare.sh (modified) (2 diffs)

trunk/dassbuild/svn_build_prepare.sh

@@ -82 +82 @@
             SVN_BUILD_RELEASE=${SVN_BUILD_RELEASE}p
             REBUILD="yes"
-        else 
-            # check if RPM has been built already
-            # TODO: this check is broken for OpenSUSE build service,
-            #       because version is changed later on
-            EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-${VERSION}-${SVN_BUILD_RELEASE}.*.rpm
-            if [ -f "$EXPECTED_DEST_RPM_FILENAME" ]; then
-                echo
-                echo "Build of \"${PACKAGE}\" unnecessary. Current RPM already at " $EXPECTED_DEST_RPM_FILENAME
-                echo
-                exit 1
-            fi
         fi
 
@@ -102 +91 @@
         fi
         echo "SVN_BUILD_RELEASE: $SVN_BUILD_RELEASE"
-        
+        echo "VERSION: $VERSION"
+
+        #
+        # check, if RPM should be build again
+        #
+        if [ -z "$REBUILD" ]; then
+            # check if RPM has been built already
+            # TODO: is this useful for OpenSUSE Build Service?
+            EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-${VERSION}-*.*.rpm
+            echo "EXPECTED_DEST_RPM_FILENAME: $EXPECTED_DEST_RPM_FILENAME"
+            if find $EXPECTED_DEST_RPM_FILENAME ; then
+                echo
+                echo "Build of \"${PACKAGE}\" unnecessary."
+                echo "Current RPM already at " $EXPECTED_DEST_RPM_FILENAME
+                echo
+                exit 1
+            fi
+        fi
+
         printf "adding subversion changelog: "
         # changelog header