projects
/
git-tools-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Less verbose id-mk-deb-src.sh
[git-tools-moved-to-github.git]
/
id-rpm-build
/
upload-rpms.sh
diff --git
a/id-rpm-build/upload-rpms.sh
b/id-rpm-build/upload-rpms.sh
index
bc4e6c7
..
9450fbe
100755
(executable)
--- a/
id-rpm-build/upload-rpms.sh
+++ b/
id-rpm-build/upload-rpms.sh
@@
-18,6
+18,8
@@
fi
if test -z "$DISTRO"; then
if grep 'release 6' /etc/redhat-release >/dev/null; then
DISTRO="centos/6"
if test -z "$DISTRO"; then
if grep 'release 6' /etc/redhat-release >/dev/null; then
DISTRO="centos/6"
+ elif grep 'release 7' /etc/redhat-release > /dev/null; then
+ DISTRO="centos/7"
else
DISTRO="centos/5.5"
fi
else
DISTRO="centos/5.5"
fi
@@
-42,21
+44,24
@@
if test ! -d ${BUILD_DIR}/RPMS; then
fi
for pkg in ${pkg_names}; do
fi
for pkg in ${pkg_names}; do
+ copy=false
if $inc_src; then
if $inc_src; then
- if test ! -f ${BUILD_DIR}/SRPMS/${pkg}.src.rpm; then
- echo "No SRPM for ${pkg}"
- else
+ if test -f ${BUILD_DIR}/SRPMS/${pkg}.src.rpm; then
scp ${BUILD_DIR}/SRPMS/${pkg}.src.rpm ${UPLOAD_URI}/redhat/${DISTRO}/SRPMS/
scp ${BUILD_DIR}/SRPMS/${pkg}.src.rpm ${UPLOAD_URI}/redhat/${DISTRO}/SRPMS/
- fi
- fi
+ copy=true
+ fi
+ fi
if $inc_bin; then
for dir in ${BUILD_DIR}/RPMS/*; do
arch=`basename ${dir}`
if test -f ${dir}/${pkg}.${arch}.rpm; then
if $inc_bin; then
for dir in ${BUILD_DIR}/RPMS/*; do
arch=`basename ${dir}`
if test -f ${dir}/${pkg}.${arch}.rpm; then
+ copy=true
scp ${dir}/${pkg}.${arch}.rpm ${UPLOAD_URI}/redhat/${DISTRO}/RPMS/${arch}/
scp ${dir}/${pkg}.${arch}.rpm ${UPLOAD_URI}/redhat/${DISTRO}/RPMS/${arch}/
- else
- echo "No ${pkg} in arch ${arch}"
fi
done
fi
done
+ if ! $copy; then
+ echo "FAILED: No RPM copied for: ${pkg}"
+ exit 1
+ fi
fi
done
fi
done