From: jingui.ren Date: Wed, 12 Sep 2018 08:48:19 +0000 (+0800) Subject: add --force to ignore file conflicts between packages X-Git-Tag: accepted/tizen/devbase/tools/20190927.044855~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77cc4a3afc6864effe8b6307f7ba9a5c34b9a142;p=tools%2Fbuild.git add --force to ignore file conflicts between packages Change-Id: I1b86904ba53853ca90436647f90d539a17134e7b --- diff --git a/build-pkg-rpm b/build-pkg-rpm index 2c385cc..a87fbbb 100644 --- a/build-pkg-rpm +++ b/build-pkg-rpm @@ -109,7 +109,7 @@ pkg_cumulate_rpm() { } pkg_install_rpm() { - ( cd "$BUILD_ROOT" && chroot "$BUILD_ROOT" rpm --ignorearch --nodeps -U --oldpackage --ignoresize $RPMCHECKOPTS \ + ( cd "$BUILD_ROOT" && chroot "$BUILD_ROOT" rpm --ignorearch --force --nodeps -U --oldpackage --ignoresize $RPMCHECKOPTS \ $ADDITIONAL_PARAMS .init_b_cache/$PKG.rpm 2>&1 || \ touch "$BUILD_ROOT"/exit ) | \ grep -v "^warning:.*saved as.*rpmorig$"