exit 2 ;;
"err_no_spec_in_repo" )
remove_build_requires
- echo >&2 "Error: spec file not stored in PLD repo."
+ echo >&2 "Error: spec file not stored in repository."
+ if [ -n "$2" ]; then
+ echo >&2 "Tried: $2"
+ fi
+
exit 3 ;;
"err_no_source_in_repo" )
remove_build_requires
# create symlinks for tools
if [ "$SYMLINK_TOOLS" != "no" -a -d "$PACKAGE_DIR" ]; then
- for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh; do
+ for a in dropin md5 builder {relup,compile,repackage,rsync,pearize}.sh; do
# skip tools that don't exist in top dir
[ -f $a ] || continue
# skip tools that already exist
fi
if [ ! -f "$PACKAGE_DIR/$SPECFILE" ]; then
- Exit_error err_no_spec_in_repo
+ Exit_error err_no_spec_in_repo "$PACKAGE_DIR/$SPECFILE"
fi
if [ "$CHMOD" = "yes" -a -n "$SPECFILE" ]; then
unset GIT_WORK_TREE GIT_DIR
# these are set by jenkins
unset GIT_PREVIOUS_COMMIT GIT_URL GIT_PREVIOUS_SUCCESSFUL_COMMIT GIT_BRANCH GIT_COMMIT
+ # this may be set by user
+ unset GIT_SSH
# fail if something still set
env | grep ^GIT_ && Exit_error err_build_fail
local DEPS CNFL
if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
# TODO: Conflicts list doesn't check versions
- CNFL=$(rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
- DEPS=$(rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+ CNFL=$(eval rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
+ DEPS=$(eval rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
fi
if [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
- CNFL=$(rpm -q --specsrpm --conflicts $BCOND $RPMOPTS $SPECFILE | awk '{print $1}' | _rpm_cnfl_check | xargs)
- DEPS=$(rpm -q --specsrpm --requires $BCOND $RPMOPTS $SPECFILE | awk '{print $1}' | _rpm_prov_check | xargs)
+ CNFL=$(eval rpm -q --specsrpm --conflicts $BCOND $RPMOPTS $SPECFILE | awk '{print $1}' | _rpm_cnfl_check | xargs)
+ DEPS=$(eval rpm -q --specsrpm --requires $BCOND $RPMOPTS $SPECFILE | awk '{print $1}' | _rpm_prov_check | xargs)
fi
if [ -n "$CNFL" ]; then
cd "$TOP_DIR"
init_repository ${PACKAGES_DIR}/rpm-build-tools.git ../rpm-build-tools
init_repository projects/$TEMPLATES ../$TEMPLATES
- for a in adapter builder fetchsrc_request compile repackage; do
+ for a in builder fetchsrc_request compile repackage; do
ln -sf ../rpm-build-tools/${a}.sh $a
done
for a in md5; do