You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/12/17 14:08:28 UTC
[GitHub] ocket8888 closed pull request #2789: Added missing 'cronie'
dependency
ocket8888 closed pull request #2789: Added missing 'cronie' dependency
URL: https://github.com/apache/trafficcontrol/pull/2789
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec
index b47251e89..6b974d4f2 100644
--- a/traffic_ops/build/traffic_ops.spec
+++ b/traffic_ops/build/traffic_ops.spec
@@ -33,7 +33,7 @@ URL: https://github.com/apache/trafficcontrol/
Vendor: Apache Software Foundation
Packager: daniel_kirkwood at Cable dot Comcast dot com
AutoReqProv: no
-Requires: cpanminus, expat-devel, gcc-c++, golang = 1.9.4, libcurl, libpcap-devel, mkisofs, tar
+Requires: cpanminus, expat-devel, gcc-c++, golang = 1.9.4, libcurl, libpcap-devel, mkisofs, tar, cronie
Requires: openssl-devel, perl, perl-core, perl-DBD-Pg, perl-DBI, perl-Digest-SHA1
Requires: libidn-devel, libcurl-devel, libcap
Requires: postgresql96 >= 9.6.2 , postgresql96-devel >= 9.6.2
@@ -62,7 +62,7 @@ Built: %(date) by %{getenv: USER}
echo "GOPATH: $GOPATH"
go version
go env
-
+
# Create build area with proper gopath structure
mkdir -p src pkg bin || { echo "Could not create directories in $(pwd): $!"; exit 1; }
@@ -91,11 +91,11 @@ Built: %(date) by %{getenv: USER}
}
oldpwd=$(pwd)
#copy in traffic_ops/vendor
- vendordir=src/github.com/apache/trafficcontrol/traffic_ops/vendor
+ vendordir=src/github.com/apache/trafficcontrol/traffic_ops/vendor
( mkdir -p "$vendordir" && \
cd "$vendordir" && \
cp -r "$TC_DIR"/traffic_ops/vendor/* . \
- ) || { echo "could not copy traffic_ops/vendor directory"; exit 1; }
+ ) || { echo "could not copy traffic_ops/vendor directory"; exit 1; }
# build traffic_ops_golang binary
godir=src/github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang
@@ -190,7 +190,7 @@ Built: %(date) by %{getenv: USER}
%__chmod +x /etc/init.d/traffic_ops
%__chmod +x %{PACKAGEDIR}/install/bin/*
/sbin/chkconfig --add traffic_ops
-
+
%__mkdir -p %{TRAFFIC_OPS_LOG_DIR}
if [ -f /var/tmp/traffic_ops-backup.tar ]; then
@@ -230,7 +230,7 @@ if [ "$1" = "0" ]; then
# this is an uninstall
%__rm -rf %{PACKAGEDIR}
%__rm /etc/init.d/traffic_ops
- /usr/bin/getent passwd %{TRAFFIC_OPS_USER} || /usr/sbin/userdel %{TRAFFIC_OPS_USER}
+ /usr/bin/getent passwd %{TRAFFIC_OPS_USER} || /usr/sbin/userdel %{TRAFFIC_OPS_USER}
/usr/bin/getent group %{TRAFFIC_OPS_GROUP} || /usr/sbin/groupdel %{TRAFFIC_OPS_GROUP}
fi
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services