Changeset 1033 for rpmbuild-bot

Timestamp:

Feb 24, 2017, 11:50:35 PM (8 years ago)

Author:

dmik

Message:

rpmbuild-bot: Add RPMBUILD_BOT_SPEC_DIR variable.

This variable may be used in rpmbuild-bot-local.sh to override
%_specdir (which defaults to $HOME/rpmbuild/SPECS).

Location:

rpmbuild-bot

Files:

• rpmbuild-bot-local.sh (modified) (1 diff)
• rpmbuild-bot.sh (modified) (3 diffs)

rpmbuild-bot/rpmbuild-bot-local.sh

@@ -18 +18 @@
 #
 
+# Local directory to look for .spec files w/o path.
+# This is normall an SVN repository where .spec files will be committed
+# by the upload command.
+RPMBUILD_BOT_SPEC_DIR="D:/Coding/rpm/spec/SPECS"
+
 # Local netdrive directory that maps to rpm.netlabs.org over WEBDAV.
 RPM_NETLABS_ORG_DIR="Y:/webdav/rpm.netlabs.org"

rpmbuild-bot/rpmbuild-bot.sh

@@ -888 +888 @@
 esac
 
+# Set up the rpmbuild-bot environment.
+. "${0%%.sh}-env.sh"
+
+# Check common env settings.
+test -n "$RPMBUILD_BOT_ARCH_LIST" || die "RPMBUILD_BOT_ARCH_LIST is empty."
+
 # Query all rpmbuild macros in a single run as it may be slow.
 eval `rpmbuild.exe --eval='rpmbuild_dir="%_topdir" ; spec_dir="%_specdir" ; src_dir="%_sourcedir" ; dist_mark="%dist"' | tr '\\\' /`
@@ -894 +900 @@
 [ -n "$spec_dir" -a -d "$spec_dir" ] || die "Falied to get %_specdir from rpmbuild or not directory ($spec_dir)."
 [ -n "$src_dir" -a -d "$src_dir" ] || die "Falied to get %_sourcedir from rpmbuild or not directory ($src_dir)."
+[ -n "$dist_mark" -a -d "$src_dir" ] || die "Falied to get %dist from rpmbuild, build command wouldn't differ from test."
+
+# RPMBUILD_BOT_SPEC_DIR overrides %_specdir
+if [ -n "$RPMBUILD_BOT_SPEC_DIR" ] ; then
+  [ -d "$RPMBUILD_BOT_SPEC_DIR" ] || die "RPMBUILD_BOT_SPEC_DIR is not directory ($RPMBUILD_BOT_SPEC_DIR)."
+  spec_dir="$RPMBUILD_BOT_SPEC_DIR"
+fi
 
 log_dir="$rpmbuild_dir/logs"
@@ -929 +942 @@
 echo "Command:   $command $options"
 
-# Set up the rpmbuild-bot environment.
-. "${0%%.sh}-env.sh"
-
-# Check common settings.
-test -n "$RPMBUILD_BOT_ARCH_LIST" || die "RPMBUILD_BOT_ARCH_LIST is empty."
-
 run eval "${command_name}_cmd"