diff options
| author | Stephan Kulow <coolo@suse.de> | 2012-09-25 10:28:12 +0200 |
|---|---|---|
| committer | Stephan Kulow <coolo@suse.de> | 2012-09-25 10:28:12 +0200 |
| commit | 06ce49791b110dea13efdec836a837697bb24a5f (patch) | |
| tree | e7c067b9def04d72c32cc5b8242410cc008ee92b | |
| parent | 03587016a7eca7788f404820642a2b5a1556aa0b (diff) | |
| download | build-06ce49791b110dea13efdec836a837697bb24a5f.tar.gz build-06ce49791b110dea13efdec836a837697bb24a5f.tar.bz2 build-06ce49791b110dea13efdec836a837697bb24a5f.zip | |
fix the logic of cumulating packages when building in vm - and add some more output to it
| -rwxr-xr-x | init_buildsystem | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/init_buildsystem b/init_buildsystem index 115e1bb..399ae50 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -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 |