X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Fbuild%2Fbuild-freeside;h=afef96ab6347c2d101fd81f4d26a7edb05384b1d;hp=d3bb2116863a3831165f5533105de03413fdd127;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=115d17b7a091bd92d4c8073fdfaba5a69420bcf3 diff --git a/rpm/build/build-freeside b/rpm/build/build-freeside index d3bb21168..afef96ab6 100755 --- a/rpm/build/build-freeside +++ b/rpm/build/build-freeside @@ -139,7 +139,7 @@ do echo "$os - $arch: $srpm" echo mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm} time mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm} - if [ -f $MOCKWORK/${os}-${arch}/state/status ] && grep done $MOCKWORK/${os}-${arch}/state/status + if true #[ -f $MOCKWORK/${os}-${arch}/state/status ] && grep done $MOCKWORK/${os}-${arch}/state/status then for VERSION in $VERSIONS do @@ -149,7 +149,8 @@ do DEST=$BRANCH fi # Copy freeside RPMs for this version only - FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` + #FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` + FILES=`ls -1 $MOCKWORK/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` echo $FILES if [ "${FILES}x" != "x" ] then @@ -165,7 +166,8 @@ do fi fi # Copy non-freeside RPMs to all versions - FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` + #FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` + FILES=`ls -1 $MOCKWORK/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` echo $FILES if [ "${FILES}x" != "x" ] then