diff options
| author | y0169.zhang <y0169.zhang@samsung.com> | 2016-11-17 14:49:10 +0900 |
|---|---|---|
| committer | SoonKyu Park <sk7.park@samsung.com> | 2016-12-27 18:03:07 +0900 |
| commit | 79ddc1256bad77ee0a97409706495c0c03012562 (patch) | |
| tree | fde2eb309a0484336db4d087dae2707aba5e572a | |
| parent | e4d357f47826b3b53dc41d5152a010805e558a73 (diff) | |
| download | build-79ddc1256bad77ee0a97409706495c0c03012562.tar.gz build-79ddc1256bad77ee0a97409706495c0c03012562.tar.bz2 build-79ddc1256bad77ee0a97409706495c0c03012562.zip | |
Revert the command of get cache packages id
Change-Id: I8a0007b09bf5d42f56cd5d9d6265878098cf7b63
| -rwxr-xr-x | init_buildsystem | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init_buildsystem b/init_buildsystem index 451de14..9d3fd80 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -47,6 +47,9 @@ repos=() BUILD_IS_RUNNING=$BUILD_ROOT/not-ready TMPFILE=$BUILD_ROOT/tmpfile +RPMIDFMT="%{NAME}-%{VERSION}-%{RELEASE} %{BUILDTIME}-%{ARCH}\n" +RPMCHECKOPTS_HOST= +test -x /usr/bin/rpmquery && RPMCHECKOPTS_HOST="--nodigest --nosignature" # should RPMs be installed with --force ? USE_FORCE=false @@ -424,7 +427,7 @@ can_reuse_cached_package() { local cachepkgid pkgid test -s "$1" || return 1 if test -s "$BUILD_ROOT/.init_b_cache/rpms/$PKG.id" ; then - pkgid=$(perl -I$BUILD_DIR -MBuild -e Build::showquery "$1" buildid) + pkgid=$(rpm -qp --qf "${RPMIDFMT}" $RPMCHECKOPTS_HOST "${1}") read cachepkgid < $BUILD_ROOT/.init_b_cache/rpms/$PKG.id test "$cachepkgid" = "$pkgid" || return 1 fi |