Skip to content

Commit

Permalink
fix the logic of cumulating packages when building in vm - and add so…
Browse files Browse the repository at this point in the history
…me more output to it
  • Loading branch information
coolo committed Sep 25, 2012
1 parent 0358701 commit 06ce497
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions init_buildsystem
Original file line number Diff line number Diff line change
Expand Up @@ -1030,16 +1030,15 @@ for PKG in $MAIN_LIST; do
((cumulate < 0)) && continue
exec 4>$BUILD_ROOT/.init_b_cache/manifest
for ((num=0; num<=cumulate; num++)) ; do
echo ${CUMULATED_LIST[$num]} 1>&4
PKG=${CUMULATED_LIST[$num]##*/}
test "$BUILD_ROOT/.init_b_cache/rpms/$PKG" -ef "$BUILD_ROOT/${CUMULATED_LIST[$num]}" && continue
rm -f $BUILD_ROOT/${CUMULATED_LIST[$num]}
cp $BUILD_ROOT/.init_b_cache/rpms/$PKG $BUILD_ROOT/${CUMULATED_LIST[$num]} || cleanup_and_exit 1
echo ${CUMULATED_LIST[$num]} 1>&4
done
exec 4>&-
( chroot $BUILD_ROOT rpm --ignorearch --nodeps -U --oldpackage --ignoresize --verbose $RPMCHECKOPTS \
$ADDITIONAL_PARAMS .init_b_cache/manifest 2>&1 || touch $BUILD_ROOT/exit ) | \
grep -v "^warning:.*saved as.*rpmorig$"
chroot $BUILD_ROOT rpm --ignorearch --nodeps -Uh --oldpackage --ignoresize --verbose $RPMCHECKOPTS \
$ADDITIONAL_PARAMS .init_b_cache/manifest 2>&1 || touch $BUILD_ROOT/exit
for ((num=0; num<=cumulate; num++)) ; do
rm -f $BUILD_ROOT/${CUMULATED_LIST[$num]}
done
Expand Down

0 comments on commit 06ce497

Please sign in to comment.