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 (file)
--- 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$"