Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
b116b9d2
Commit
b116b9d2
authored
6 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Don't repeatedly upgrade to python3
parent
dd18c876
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/freedombone-app-matrix
+16
-14
16 additions, 14 deletions
src/freedombone-app-matrix
with
16 additions
and
14 deletions
src/freedombone-app-matrix
+
16
−
14
View file @
b116b9d2
...
...
@@ -538,22 +538,24 @@ function upgrade_matrix {
export
TMPDIR
=
/etc/matrix/tmp
# install python3 packages
if
[[
"
$MATRIX_PYTHON
"
!=
'/usr/bin/python'
]]
;
then
if
[
-d
/usr/local/lib/python3.5/dist-packages/pip
]
;
then
rm
-rf
/usr/local/lib/python3.5/dist-packages/pip
if
!
grep
-q
"
$MATRIX_PYTHON
"
/etc/matrix/run-matrix
;
then
if
[[
"
$MATRIX_PYTHON
"
!=
'/usr/bin/python'
]]
;
then
if
[
-d
/usr/local/lib/python3.5/dist-packages/pip
]
;
then
rm
-rf
/usr/local/lib/python3.5/dist-packages/pip
fi
$INSTALL_PACKAGES
--reinstall
python3-pip
$INSTALL_PACKAGES
python3 python3-dev
\
python3-pip python3-psycopg2 python3-venv
\
python3-setuptools libpq-dev
\
python3-lxml python3-treq
# shellcheck disable=SC2230
MATRIX_PIP
=
$(
which pip3
)
fi
$INSTALL_PACKAGES
--reinstall
python3-pip
$INSTALL_PACKAGES
python3 python3-dev
\
python3-pip python3-psycopg2 python3-venv
\
python3-setuptools libpq-dev
\
python3-lxml python3-treq
# shellcheck disable=SC2230
MATRIX_PIP
=
$(
which pip3
)
fi
# recreate the daemon if needed
matrix_systemd_daemon
# recreate the daemon if needed
matrix_systemd_daemon
fi
$MATRIX_PIP
install
--upgrade
--process-dependency-links
.
$MATRIX_PIP
install
--upgrade
--force
"pynacl>=1.2.1"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment