diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2018-10-30 07:50:17 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2018-10-30 07:50:17 +0000 |
| commit | a6be9732392324eca27d807f74961f2efeea1db3 (patch) | |
| tree | 377e0635de30b3a0edfe78c1e71c0847993d8778 /www | |
| parent | 50ff7b128236c8aeca95367e2cc87c36e87f6055 (diff) | |
| download | ports-a6be9732392324eca27d807f74961f2efeea1db3.tar.gz ports-a6be9732392324eca27d807f74961f2efeea1db3.zip | |
One of the last dependency updates gitlab-ce requires, has broken the Gemfile.lock generation for user git.
I use now a work-around to generate the file as user root and change the ownership back to git.
This commit can maybe be undone if the source of the problem is fixed.
PR: 232791
Reported by: freebsd@felix.flornet.de
Approved by: mentors (implicit)
MFC after: 1 day
MFH: 2018Q4
Notes
Notes:
svn path=/head/; revision=483457
Diffstat (limited to 'www')
| -rw-r--r-- | www/gitlab-ce/files/gitlab.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/www/gitlab-ce/files/gitlab.in b/www/gitlab-ce/files/gitlab.in index 7cd77ea48a13..7320e30adc7a 100644 --- a/www/gitlab-ce/files/gitlab.in +++ b/www/gitlab-ce/files/gitlab.in @@ -91,10 +91,11 @@ if [ "$USER" != "$app_user" ]; then # Regenerate the Gemfile.lock for all related products echo "Regenerate Gitlab Gemfile.lock" rm -f "${app_root}"/Gemfile.lock - if ! su -l ${app_user} -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then + if ! su -l root -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" exit 1 fi + chown git "${app_root}"/Gemfile.lock echo "Regenerate Gitaly Gemfile.lock" rm -f "${gitaly_dir}"/ruby/Gemfile.lock if ! su -l root -c "cd ${gitaly_dir}/ruby && %%LOCALBASE%%/bin/bundle install --local --quiet"; then |