From: Jiankang Fan <jiankang.fan@samsung.com>
Date: Sat, 11 Feb 2017 06:03:51 +0000 (+0900)
Subject: revert to old version, use rpm command to query pkgid
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-20170217;p=tools%2Fbuild.git

revert to old version, use rpm command to query pkgid
Because rpm command faster than perl query

Change-Id: Ib4dabfb78253779bbdc47aa27d5be085dca2ed4a
Signed-off-by: Jiankang Fan <jiankang.fan@samsung.com>
---

diff --git a/init_buildsystem b/init_buildsystem
index 9d3fd80..2ed0473 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -978,8 +978,13 @@ for PKG in $MAIN_LIST ; do
 	    continue
 	fi
     fi
-
-    PKGID=$(perl -I$BUILD_DIR -MBuild -e Build::showquery "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" buildid)
+    
+    # revert use rpm to query pkgid if building rpm package 
+    if test "$PSUF" != "rpm" ; then
+        PKGID=$(perl -I$BUILD_DIR -MBuild -e Build::showquery "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" buildid)
+    else
+        PKGID=`rpm -qp --qf "$RPMIDFMT" $RPMCHECKOPTS_HOST $BUILD_ROOT/.init_b_cache/rpms/$PKG.rpm`
+    fi
 
     if test -f $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG ; then
 	read OLDPKGID < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG