Changeset 2275

Timestamp:

10/22/07 07:39:22 (6 years ago)

Author:

alanbach-guest

Message:

little more fixes to make the scipt working again

File:

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

scripts/autobuild.bash

@@ -48 +48 @@
 if [ ! -f /var/cache/pbuilder/base-$PXBUILDARCH.tgz ]; then
     echo "${GREEN}Creating ${YELLOW}$PXBUILDARCH${NORMAL} ${GREEN}chroot...${NORMAL}"
-    pbuilder --create --distribution lenny --override-config --debootstrap debootstrap --debootstrapopts --arch --debootstrapopts $PXBUILDARCH --logfile $LOG_FILE --mirror $APT_MIRROR --othermirror "deb http://parsix.org/packages ramon main contrib non-free" &> /dev/null || echo "Build failed" >> $LOG_FILE && revert_pbrc && exit
+    pbuilder --create --distribution lenny --override-config --debootstrap debootstrap --debootstrapopts --arch --debootstrapopts $PXBUILDARCH --logfile $LOG_FILE --mirror $APT_MIRROR --othermirror "deb http://parsix.org/packages ramon main contrib non-free" &> /dev/null || exit
 else
     echo "${GREEN}Updating ${YELLOW}$PXBUILDARCH${NORMAL} ${GREEN}chroot...${NORMAL}"
-    pbuilder --update --distribution lenny --override-config --debootstrap debootstrap --debootstrapopts --arch --debootstrapopts $PXBUILDARCH --logfile $LOG_FILE --mirror $APT_MIRROR --othermirror "deb http://parsix.org/packages ramon main contrib non-free" &> /dev/null || echo "Build failed" >> $LOG_FILE && revert_pbrc && exit
+    pbuilder --update --distribution lenny --override-config --debootstrap debootstrap --debootstrapopts --arch --debootstrapopts $PXBUILDARCH --logfile $LOG_FILE --mirror $APT_MIRROR --othermirror "deb http://parsix.org/packages ramon main contrib non-free" &> /dev/null || exit
 fi
 }
@@ -132 +132 @@
 # if fails, try classic manual way
 if [ ! -f $SRC_PKG_NAME$UNDERLINE$UPSTREAM_VERSION.orig.tar.gz ]; then
-       wget -c $UPSTREAM_TARBALL_URL &> /dev/null || exit 1
+       wget -c $UPSTREAM_TARBALL_URL &> /dev/null || exit
        mv `ls | grep tar.gz` $SRC_PKG_NAME$UNDERLINE$UPSTREAM_VERSION.orig.tar.gz -v >> $LOG_FILE
 fi
@@ -151 +151 @@
 # Check if both tarballs exist
 if [ ! -f tarballs/$SRC_PKG_NAME$UNDERLINE$UPSTREAM_VERSION.orig.tar.gz ]; then
-     echo "${RED}Source tarball not found${NORMAL}" && echo "Build failed" >> $LOG_FILE && exit
+     echo "${RED}Source tarball not found${NORMAL}" && exit
 fi
 
 if [ ! -f $LOCAL_REPO_PATH/$COMPONENT/$POOL/$SRC_PKG_NAME/$SRC_PKG_NAME$UNDERLINE$UPSTREAM_VERSION.orig.tar.gz ]; then
-     echo "${RED}Source tarball not found on repo${NORMAL}" && echo "Build failed" >> $LOG_FILE && exit
+     echo "${RED}Source tarball not found on repo${NORMAL}" && exit
 fi
 
@@ -170 +170 @@
 # Build amd64 packages
 echo "${GREEN}Building ${YELLOW}amd64${NORMAL} ${GREEN}specific packages...${NORMAL}"
-svn-buildpackage --svn-builder="pdebuild --use-pdebuild-internal -- --logfile $LOG_FILE" || echo "Build failed" >> $LOG_FILE && revert_pbrc && exit
+svn-buildpackage --svn-builder="pdebuild --use-pdebuild-internal -- --logfile $LOG_FILE" || exit
 
 # Revert /etc/pbuilderrc base.tgz changes
@@ -198 +198 @@
     # Build i386 packages
     echo "${GREEN}Building ${YELLOW}i386${NORMAL} ${GREEN}specific packages...${NORMAL}"
-    svn-buildpackage --svn-builder="pdebuild --use-pdebuild-internal --debbuildopts -B -- --logfile $LOG_FILE" || echo "Build failed" >> $LOG_FILE && revert_pbrc  && exit
+    svn-buildpackage --svn-builder="pdebuild --use-pdebuild-internal --debbuildopts -B -- --logfile $LOG_FILE" || exit
 
     # Revert /etc/pbuilderrc base.tgz changes