Attachment 78413 Details for Bug 154385

[patch] fixed patch header

rpm-ignore-failed-stat.patch (text/plain), 1.82 KB, created by Greg Edwards on 2006-04-13 22:06:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Edwards

Created: 2006-04-13 22:06:16 UTC

Size: 1.82 KB

patch

obsolete

>Ignore failed stats on rpm -e lines.  We can't use --ignoresize since
>not all rpm versions support this.
>
>---
> init_buildsystem |    9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>Index: build/init_buildsystem
>===================================================================
>--- build.orig/init_buildsystem	2006-03-27 11:59:17.000000000 -0600
>+++ build/init_buildsystem	2006-04-13 16:59:27.208866959 -0500
>@@ -285,7 +285,8 @@ for PKG in $BUILD_ROOT/.init_b_cache/tod
>     test "$PKG" = "*" && continue
>     echo deleting `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/todelete/$PKG`
>     chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
>-	grep -v "^r.*failed: No such file or directory"
>+	grep -v -e "^r.*failed: No such file or directory" \
>+		-e "^error: failed to stat .*: No such file or directory"
> done
> rm -rf $BUILD_ROOT/.init_b_cache/todelete
> 
>@@ -311,13 +312,15 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RU
> 	if test "$PKGID" != "`cat $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG`" ; then
> 	    echo deleting unwanted `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG`
> 	    chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
>-		grep -v "^r.*failed: No such file or directory"
>+		grep -v -e "^r.*failed: No such file or directory" \
>+			-e "^error: failed to stat .*: No such file or directory"
> 	elif test "$VERIFY_BUILD_SYSTEM" = true ; then
> 	    chroot $BUILD_ROOT rpm --verify $PKG 2>&1 | tee $TMPFILE
> 	    if grep ^missing $TMPFILE > /dev/null ; then
> 		echo deleting incomplete ${PKGID%% *}
> 		chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \
>-		    grep -v "^r.*failed: No such file or directory"
>+		    grep -v -e "^r.*failed: No such file or directory" \
>+			-e "^error: failed to stat .*: No such file or directory"
> 	    else
> 		echo "keeping ${PKGID%% *}"
> 		echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG

Actions: View | Diff

Attachments on bug 154385: 70814 | 78412 | 78413