From b5bda8fcef0eb677f84dbcf5f17be0cf1f840dbd Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 6 Mar 2022 15:40:38 +0100 Subject: [PATCH 1/5] fix ffi SystemError: ffi_prep_closure(): bad user_data (it seems that the version of the libffi library seen at runtime is different from the 'ffi.h' file seen at compile-time) --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 5de2393..1d6aa9f 100755 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ chown -R "$app": "$final_path" sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi xcffib # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install Weblate=="$weblate_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply diff --git a/scripts/upgrade b/scripts/upgrade index 029cd8a..12df674 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ upgrade() { sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi xcffib # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install --upgrade Weblate=="$new_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply From 5a0e43195d599969d055111d71cc2d094fbf8349 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 7 Mar 2022 12:45:29 +0100 Subject: [PATCH 2/5] Fix cffi it seems that the version of the libffi library seen at runtime is different from the 'ffi.h' file seen at compile-time --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 1d6aa9f..247b2da 100755 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ chown -R "$app": "$final_path" sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi xcffib + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 xcffib # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install Weblate=="$weblate_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply diff --git a/scripts/upgrade b/scripts/upgrade index 12df674..aa51035 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ upgrade() { sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi xcffib + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 xcffib # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install --upgrade Weblate=="$new_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply From 04173ff5e5e1fa1efdb45ee4530d651bbde84036 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 8 Mar 2022 22:39:27 +0100 Subject: [PATCH 3/5] remove xcffib --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 247b2da..5de2393 100755 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ chown -R "$app": "$final_path" sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 xcffib + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install Weblate=="$weblate_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply diff --git a/scripts/upgrade b/scripts/upgrade index aa51035..029cd8a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ upgrade() { sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 xcffib + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install --upgrade Weblate=="$new_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply From 2fd5bb0c66b415c70e109b89001ce390dbbd0ac1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 8 Mar 2022 22:39:32 +0100 Subject: [PATCH 4/5] Update check_process --- check_process | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 130a260..02166c3 100644 --- a/check_process +++ b/check_process @@ -15,8 +15,10 @@ setup_private=1 setup_public=1 upgrade=1 - #4.6.1 + # 4.6.1 upgrade=1 from_commit=3f8363cdc588e609a775cb8b78b9d080f96405d9 + # 4.9~ynh1 + upgrade=1 from_commit=7fec5a47a80e00458a31f1270c4ace822961e7bf backup_restore=1 multi_instance=1 port_already_use=0 From 287e9a9e1aaa4b979c28cbb74dd0b4fd5875de6d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 9 Mar 2022 22:32:30 +0100 Subject: [PATCH 5/5] remove upgrade check from no more working install --- check_process | 2 -- 1 file changed, 2 deletions(-) diff --git a/check_process b/check_process index 02166c3..12dcbbb 100644 --- a/check_process +++ b/check_process @@ -15,8 +15,6 @@ setup_private=1 setup_public=1 upgrade=1 - # 4.6.1 - upgrade=1 from_commit=3f8363cdc588e609a775cb8b78b9d080f96405d9 # 4.9~ynh1 upgrade=1 from_commit=7fec5a47a80e00458a31f1270c4ace822961e7bf backup_restore=1