Changeset 809

Timestamp:

Dec 14, 2009, 6:04:47 PM (16 years ago)

Author:

joergs

Message:

bugfix: causes errors if a spec file contains more than one Name or Version tag

File:

• dassbuild/trunk/usr/bin/dassbuild.sh (modified) (3 diffs)

dassbuild/trunk/usr/bin/dassbuild.sh

@@ -100 +100 @@
     # without parameter, we are in source directory
     SPECFILE=$(ls *.spec | awk '{print $1}')
-    PACKAGE=$(sed -n -e 's/^Name:\W*//pi' <$SPECFILE)
+    PACKAGE=$(sed -n -e 's/^Name:\W*//pi' <$SPECFILE | head -n 1)
     # use Version from BUILDSRC, 
     # because it has been modified by svn_build_prepare
     BUILDSRC_DIR=${BUILDTEMP}/src/${PACKAGE}
-    VERSION=$(sed -n -e 's/^Version:\W*//pi' <$BUILDSRC_DIR/$SPECFILE)
+    VERSION=$(sed -n -e 's/^Version:\W*//pi' <$BUILDSRC_DIR/$SPECFILE | head -n 1)
 elif [ -r "$1" ]; then
     # parameter is src.rpm file
@@ -157 +157 @@
 # fi
 
+# debug
+#set -x
+ 
 # check, if RPM with correct name and version is generated
 if [ -z "`find ${BUILD_ROOT}/usr/src/packages/RPMS/ -name \"${PACKAGE}*${VERSION}-*.rpm\" 2>/dev/null`" ]; then
@@ -178 +181 @@
 if [ $ERROR -ne 0 ]; then
 
-        echo "ERROR while building packet $PACKAGE";
+        echo "ERROR $ERROR while building packet $PACKAGE";
 else
         echo "Build of \"${PACKAGE}\" completed!"