7709: Merge branch 'master' into 7709-api-rails4

[arvados.git] / build / run-library.sh

diff --git a/build/run-library.sh b/build/run-library.sh
index 677c645268052b9b151c580cad54074a6efe252d..3d619622e4c0ac681a76375bc90dc3299d87ae2c 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -7,6 +7,8 @@
 # older packages.
 LICENSE_PACKAGE_TS=20151208015500
 
+RAILS_PACKAGE_ITERATION=7
+
 debug_echo () {
     echo "$@" >"$STDOUT_IF_DEBUG"
 }
@@ -199,7 +201,7 @@ test_package_presence() {
       deb_architecture="amd64"
 
       if [[ "$pkgtype" =~ ^(python|python3)$ ]]; then
-        rpm_architecture="all"
+        rpm_architecture="noarch"
         deb_architecture="all"
       fi
 
@@ -208,7 +210,7 @@ test_package_presence() {
         deb_architecture="all"
       fi
 
-      # These packages have binary components
+      # These python packages have binary components
       if [[ "$pkgname" =~ (ruamel|ciso|pycrypto|pyyaml) ]]; then
         rpm_architecture="x86_64"
         deb_architecture="amd64"