Changeset 2331

Timestamp:

10/25/07 09:27:25 (6 years ago)

Author:

alanbach-guest

Message:

A fix made in indep-build section, plusa an addition to control existense of changes files

File:

• scripts/autobuild.bash (modified) (5 diffs)

scripts/autobuild.bash

@@ -5 +5 @@
 #
 # Created: 2007-10-20 15:10 +330 GMT
-# Updated: 2007-10-24 13:50 +330 GMT
+# Updated: 2007-10-25 09:58 +330 GMT
 #
 # TODO:
@@ -142 +142 @@
 echo "${YELLOW}$PKG_VERSION-$PKG_REVISION${NORMAL}"
 
-echo "${GREEN}Getting the latest upstream...${NORMAL}"
+echo "${GREEN}Getting the latest upstream version...${NORMAL}"
 UPSTREAM_VERSION=`uscan --report --dehs --check-dirname-level 0 trunk/ | grep upstream-version | awk 'BEGIN{FS=">"}{print $2}' | awk 'BEGIN{FS="<"}{print $1}'`
 UPSTREAM_TARBALL_URL=`uscan --report --dehs --check-dirname-level 0 trunk/ | grep upstream-url | awk 'BEGIN{FS=">"}{print $2}' | awk 'BEGIN{FS="<"}{print $1}'`
@@ -235 +235 @@
 ARCH_AMD64_COUNT="$(ls ../build-area/ | grep -c _amd64.deb)"
 
-if [ $ARCH_ALL_COUNT -gt 1 -a $ARCH_I386_COUNT -lt 1 -a $ARCH_AMD64_COUNT -lt 1 ]; then
+if [ $ARCH_ALL_COUNT -gt 0 -a $ARCH_I386_COUNT -lt 1 -a $ARCH_AMD64_COUNT -lt 1 ]; then
     echo "${GREEN}Build is platform independent, skipping ${YELLOW}i386${NORMAL} ${GREEN}build...${NORMAL}"
     ARCH_INDEP=1
@@ -271 +271 @@
     CHANGES_FILE=`ls | grep _multi.changes$`
     DSC_FILE=`ls | grep .dsc$`
+
+    if [ -z "$CHANGES_FILE" ]; then
+        echo "${GREEN}No ${YELLOW}changes${NORMAL} ${GREEN}file?${NORMAL}"
+        echo "No changes file" >> $LOG_FILE
+        echo "Build failed" >> $LOG_FILE
+        exit 
+    fi
 
     DSC_OLDMD5SUM=`md5sum $DSC_FILE | awk '{print $1}'`
@@ -294 +301 @@
 
     CHANGES_FILE=`ls | grep _amd64.changes$`
+  
+    if [ -z "$CHANGES_FILE" ]; then
+        CHANGES_FILE=`ls | grep _i386.changes$`
+    fi
+
+    if [ -z "$CHANGES_FILE" ]; then
+        echo "${GREEN}No ${YELLOW}changes${NORMAL} ${GREEN}file?${NORMAL}"
+        echo "No changes file" >> $LOG_FILE
+        echo "Build failed" >> $LOG_FILE
+        exit 
+    fi
+ 
     DSC_FILE=`ls | grep .dsc$`