diff options
| author | jingui.ren <jingui.ren@samsung.com> | 2018-09-12 16:48:19 +0800 |
|---|---|---|
| committer | jingui.ren <jingui.ren@samsung.com> | 2018-09-26 11:00:51 +0800 |
| commit | 5b52fa254b3a940bffc3ec94963543b1d8753db2 (patch) | |
| tree | edf96d80359473aafda1ccdcc958ac2f848a06e3 | |
| parent | 6d640e61a3260d9f102589166ca6749561d23c55 (diff) | |
| download | build-5b52fa254b3a940bffc3ec94963543b1d8753db2.tar.gz build-5b52fa254b3a940bffc3ec94963543b1d8753db2.tar.bz2 build-5b52fa254b3a940bffc3ec94963543b1d8753db2.zip | |
add --replacefiles to ignore rpm installing file conflicts
Change-Id: I1b86904ba53853ca90436647f90d539a17134e7b
| -rw-r--r-- | build-pkg-rpm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-pkg-rpm b/build-pkg-rpm index 2c385cc..82e046d 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 --replacefiles --nodeps -U --oldpackage --ignoresize $RPMCHECKOPTS \ $ADDITIONAL_PARAMS .init_b_cache/$PKG.rpm 2>&1 || \ touch "$BUILD_ROOT"/exit ) | \ grep -v "^warning:.*saved as.*rpmorig$" |