Merge branch 'master' of ssh://hummus/home/git/pub/git-tools

[git-tools-moved-to-github.git] / id-deb-build / id-pbuild.sh

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index 2d588b1..e72f052 100755 (executable)
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -114,7 +114,7 @@ if $upload; then
     UPLOAD_URI=${UPLOAD_HOST}:${UPLOAD_PATH}/${PRODUCT}
     echo "Uploading to ${UPLOAD_URI}"
     if $centos; then
-       pkg_names=`rpm -q --specfile ${PRODUCT}.spec --queryformat "%{NAME}-%{VERSION}-%{RELEASE}\n"`
+       pkg_names=`sudo lxc-attach -n mockbuild -- rpm -q --specfile ~/rpmbuild/SPECS/${PRODUCT}.spec --queryformat "%{NAME}-%{VERSION}-%{RELEASE}\n"`
        for dist in ${CENTOS_DIST}; do
            case $dist in
                centos5)
@@ -238,7 +238,7 @@ if $debian; then
     cat ${ID_DEB_BUILD}/pbuilderrc > ~/.pbuilderrc
     for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
        for arch in ${USE_ARCHS}; do
-           ${ID_DEB_BUILD}/id-pbuild-root.sh --update=$update --dsc=$DSC --arch=$arch --dist=$dist &
+           sudo ${ID_DEB_BUILD}/id-pbuild-root.sh --update=$update --dsc=$DSC --arch=$arch --dist=$dist &
            i=`expr $i + 1`
            if test $i -ge $concurrency; then
                i=0