Changeset 839 for rpmbuild-bot

Timestamp:

Aug 24, 2016, 9:46:12 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Fix regerssion in r833.

Would give wrong arch list for spec files with dashes in names.

Location:

rpmbuild-bot

Files:

• rpmbuild-bot-env.sh (modified) (1 diff)
• rpmbuild-bot.sh (modified) (1 diff)

rpmbuild-bot/rpmbuild-bot-env.sh

@@ -60 +60 @@
 
 # Overrides of RPM arch list for specific packages.
+# Note that dash symbols in package names should be replaced with underscores
+# in the variables below (e.g. use RPMBUILD_BOT_ARCH_LIST_foo_bar for the
+# foo-bar package).
 RPMBUILD_BOT_ARCH_LIST_libc="i686" # Binary build -> no other archs.
 

rpmbuild-bot/rpmbuild-bot.sh

@@ -333 +333 @@
 build_cmd()
 {
-  eval local arch_list="\${RPMBUILD_BOT_ARCH_LIST_${spec_name}}"
+  local spec_name_=`echo "${spec_name}" | tr - _`
+  eval local arch_list="\${RPMBUILD_BOT_ARCH_LIST_${spec_name_}}"
   [ -z "$arch_list" ] && arch_list="${RPMBUILD_BOT_ARCH_LIST}"