View | Details | Raw Unified | Return to bug 154385
Collapse All | Expand All

(-)build.orig/init_buildsystem (-3 / +6 lines)
Lines 285-291 for PKG in $BUILD_ROOT/.init_b_cache/tod Link Here
285
    test "$PKG" = "*" && continue
285
    test "$PKG" = "*" && continue
286
    echo deleting `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/todelete/$PKG`
286
    echo deleting `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/todelete/$PKG`
287
    chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
287
    chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
288
	grep -v "^r.*failed: No such file or directory"
288
	grep -v -e "^r.*failed: No such file or directory" \
289
		-e "^error: failed to stat .*: No such file or directory"
289
done
290
done
290
rm -rf $BUILD_ROOT/.init_b_cache/todelete
291
rm -rf $BUILD_ROOT/.init_b_cache/todelete
291
292
Lines 311-323 for PKG in $PACKAGES_TO_INSTALL_FIRST RU Link Here
311
	if test "$PKGID" != "`cat $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG`" ; then
312
	if test "$PKGID" != "`cat $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG`" ; then
312
	    echo deleting unwanted `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG`
313
	    echo deleting unwanted `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG`
313
	    chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
314
	    chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
314
		grep -v "^r.*failed: No such file or directory"
315
		grep -v -e "^r.*failed: No such file or directory" \
316
			-e "^error: failed to stat .*: No such file or directory"
315
	elif test "$VERIFY_BUILD_SYSTEM" = true ; then
317
	elif test "$VERIFY_BUILD_SYSTEM" = true ; then
316
	    chroot $BUILD_ROOT rpm --verify $PKG 2>&1 | tee $TMPFILE
318
	    chroot $BUILD_ROOT rpm --verify $PKG 2>&1 | tee $TMPFILE
317
	    if grep ^missing $TMPFILE > /dev/null ; then
319
	    if grep ^missing $TMPFILE > /dev/null ; then
318
		echo deleting incomplete ${PKGID%% *}
320
		echo deleting incomplete ${PKGID%% *}
319
		chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
321
		chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
320
		    grep -v "^r.*failed: No such file or directory"
322
		    grep -v -e "^r.*failed: No such file or directory" \
323
			-e "^error: failed to stat .*: No such file or directory"
321
	    else
324
	    else
322
		echo "keeping ${PKGID%% *}"
325
		echo "keeping ${PKGID%% *}"
323
		echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
326
		echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG

Return to bug 154385