[arvados] updated: 2.7.0-6454-gf249cb9de5

git repository hosting git at public.arvados.org
Mon Apr 22 18:46:05 UTC 2024


Summary of changes:
 build/rails-package-scripts/postinst.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  f249cb9de50e7da3806aca5f07ed7e733b9dbc7e (commit)
      from  7e2165a5b7561f0c84ede6ab4ae58003a1551a48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f249cb9de50e7da3806aca5f07ed7e733b9dbc7e
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Apr 22 14:32:40 2024 -0400

    21700: Narrow `bundle install` workaround options
    
    This prevents `gem install` from resolving dependencies differently from
    Bundler and creating its own set of problems.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh
index d0d5ef4408..77bc08052a 100644
--- a/build/rails-package-scripts/postinst.sh
+++ b/build/rails-package-scripts/postinst.sh
@@ -210,7 +210,8 @@ configure_version() {
   # which are already installed system-wide, which causes bundle activation to
   # fail later. Work around this by installing all gems manually.
   find vendor/cache -maxdepth 1 -name '*.gem' -print0 \
-      | run_and_report "Installing bundle gems" xargs -0r gem install --quiet
+      | run_and_report "Installing bundle gems" xargs -0r \
+                       gem install --conservative --ignore-dependencies --local --quiet
   # The earlier `bundle config` should have it looking for installed gems in
   # the right place. Unset GEM_HOME now to be sure.
   unset GEM_HOME

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list