Changeset 2331


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/autobuild.bash

    r2322 r2331  
    55# 
    66# Created: 2007-10-20 15:10 +330 GMT 
    7 # Updated: 2007-10-24 13:50 +330 GMT 
     7# Updated: 2007-10-25 09:58 +330 GMT 
    88# 
    99# TODO: 
     
    142142echo "${YELLOW}$PKG_VERSION-$PKG_REVISION${NORMAL}" 
    143143 
    144 echo "${GREEN}Getting the latest upstream...${NORMAL}" 
     144echo "${GREEN}Getting the latest upstream version...${NORMAL}" 
    145145UPSTREAM_VERSION=`uscan --report --dehs --check-dirname-level 0 trunk/ | grep upstream-version | awk 'BEGIN{FS=">"}{print $2}' | awk 'BEGIN{FS="<"}{print $1}'` 
    146146UPSTREAM_TARBALL_URL=`uscan --report --dehs --check-dirname-level 0 trunk/ | grep upstream-url | awk 'BEGIN{FS=">"}{print $2}' | awk 'BEGIN{FS="<"}{print $1}'` 
     
    235235ARCH_AMD64_COUNT="$(ls ../build-area/ | grep -c _amd64.deb)" 
    236236 
    237 if [ $ARCH_ALL_COUNT -gt 1 -a $ARCH_I386_COUNT -lt 1 -a $ARCH_AMD64_COUNT -lt 1 ]; then 
     237if [ $ARCH_ALL_COUNT -gt 0 -a $ARCH_I386_COUNT -lt 1 -a $ARCH_AMD64_COUNT -lt 1 ]; then 
    238238    echo "${GREEN}Build is platform independent, skipping ${YELLOW}i386${NORMAL} ${GREEN}build...${NORMAL}" 
    239239    ARCH_INDEP=1 
     
    271271    CHANGES_FILE=`ls | grep _multi.changes$` 
    272272    DSC_FILE=`ls | grep .dsc$` 
     273 
     274    if [ -z "$CHANGES_FILE" ]; then 
     275        echo "${GREEN}No ${YELLOW}changes${NORMAL} ${GREEN}file?${NORMAL}" 
     276        echo "No changes file" >> $LOG_FILE 
     277        echo "Build failed" >> $LOG_FILE 
     278        exit  
     279    fi 
    273280 
    274281    DSC_OLDMD5SUM=`md5sum $DSC_FILE | awk '{print $1}'` 
     
    294301 
    295302    CHANGES_FILE=`ls | grep _amd64.changes$` 
     303   
     304    if [ -z "$CHANGES_FILE" ]; then 
     305        CHANGES_FILE=`ls | grep _i386.changes$` 
     306    fi 
     307 
     308    if [ -z "$CHANGES_FILE" ]; then 
     309        echo "${GREEN}No ${YELLOW}changes${NORMAL} ${GREEN}file?${NORMAL}" 
     310        echo "No changes file" >> $LOG_FILE 
     311        echo "Build failed" >> $LOG_FILE 
     312        exit  
     313    fi 
     314  
    296315    DSC_FILE=`ls | grep .dsc$` 
    297316 
Note: See TracChangeset for help on using the changeset viewer.