[X2Go-Commits] [buildscripts] 01/02: bin/build-rpm-package: don't use ~mock, but hardcode /var/lib/mock.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit ee16c4f1f2b00756f226a0a7ba4952bbd264eb48
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 18 06:14:14 2017 +0200

    bin/build-rpm-package: don't use ~mock, but hardcode /var/lib/mock.
    
    Typical systems do not have a "mock" user, only a "mock" group. The
    directory is hardcoded in mock's man page, so it's probably fine to
    hardcode it as well.
---
 bin/build-rpm-package | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 06f95b5..ca7cac6 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -892,7 +892,12 @@ build_packages() {
 						# Build SRPM.
 						typeset base_arch="${arches[1]}"
 						if [ "x${l_DIST}" = "xfedora" ] || [ "x${l_DIST}" = "xepel" ]; then
-							while [ -d ~mock/"${l_DIST}-${l_CODENAME}-${base_arch}" ]; do
+							# Previously used ~mock here, but don't, since on typical systems
+							# (no matter whether Debian, CentOS or Fedora), a "mock" user does
+							# exist - only a "mock" group.
+							# /var/lib/mock is hardcoded in mock's man page as the chroots
+							# location, so use the same hardcoded value.
+							while [ -d "/var/lib/mock/${l_DIST}-${l_CODENAME}-${base_arch}" ]; do
 								echo "Waiting for some other build to finish..."
 								sleep 30
 							done
@@ -985,7 +990,12 @@ build_packages() {
 									exit 1
 								fi
 							else
-								while [ -d ~mock/"${l_DIST}-${l_CODENAME}-${l_ARCH}" ]; do
+								# Previously used ~mock here, but don't, since on typical systems
+								# (no matter whether Debian, CentOS or Fedora), a "mock" user does
+								# exist - only a "mock" group.
+								# /var/lib/mock is hardcoded in mock's man page as the chroots
+								# location, so use the same hardcoded value.
+								while [ -d "/var/lib/mock/${l_DIST}-${l_CODENAME}-${l_ARCH}" ]; do
 									echo "Waiting for some other build to finish..."
 									sleep 30
 								done

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git