4e64518881
merge upstream
2024-03-10 14:14:35 +01:00
18b8f9ab4b
Revert "Allow customizations to Roundcube settings to persist between updates by including a configuration override file, if it exists ( #2333 )"
...
This reverts commit 1b8cdeb644
2024-03-10 08:25:34 -04:00
0b1d92388a
Take spamhaus return codes into account in status check and postfix config ( #2332 )
2024-03-10 08:09:36 -04:00
1b8cdeb644
Allow customizations to Roundcube settings to persist between updates by including a configuration override file, if it exists ( #2333 )
2024-03-10 08:02:16 -04:00
1053340124
setup/preflight.sh: fix some minor shellcheck complaints ( #2342 )
...
This file passes shellcheck now without errors.
This paritally fixes #1457 - the former errors where:
$ shellcheck setup/preflight.sh
In setup/preflight.sh line 1:
^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.
In setup/preflight.sh line 29:
if [ $TOTAL_PHYSICAL_MEM -lt 490000 ]; then
^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean:
if [ "$TOTAL_PHYSICAL_MEM" -lt 490000 ]; then
In setup/preflight.sh line 31:
TOTAL_PHYSICAL_MEM=$(expr \( \( $TOTAL_PHYSICAL_MEM \* 1024 \) / 1000 \) / 1000)
^--^ SC2003 (style): expr is antiquated. Consider rewriting this using $((..)), ${} or [[ ]].
^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean:
TOTAL_PHYSICAL_MEM=$(expr \( \( "$TOTAL_PHYSICAL_MEM" \* 1024 \) / 1000 \) / 1000)
In setup/preflight.sh line 38:
if [ $TOTAL_PHYSICAL_MEM -lt 750000 ]; then
^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
Did you mean:
if [ "$TOTAL_PHYSICAL_MEM" -lt 750000 ]; then
For more information:
https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...
https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ...
https://www.shellcheck.net/wiki/SC2003 -- expr is antiquated. Consider rewr...
2024-03-10 08:01:13 -04:00
315d2cf691
Fixed errors found by the Ruff Python linter ( #2343 )
2024-03-10 07:57:19 -04:00
dbc2b5eee0
Fixed ISC003 (explicit-string-concatenation): Explicitly concatenated string should be implicitly concatenated
2024-03-10 07:56:49 -04:00
775a4223de
Fixed F821 (undefined-name): Undefined name `e`
2024-03-10 07:56:49 -04:00
618c466b84
Fixed SIM114 (if-with-same-arms): Combine `if` branches using logical `or` operator
2024-03-10 07:56:49 -04:00
a32354fd91
Fixed PLR5501 (collapsible-else-if): Use `elif` instead of `else` then `if`, to reduce indentation
2024-03-10 07:56:49 -04:00
1d79f9bb2b
Fixed PERF401 (manual-list-comprehension): Use a list comprehension to create a transformed list
2024-03-10 07:56:49 -04:00
cacf6d2006
Fixed E721 (type-comparison): Use `is` and `is not` for type comparisons, or `isinstance()` for isinstance checks
2024-03-10 07:56:49 -04:00
f0377dd59e
Fixed SIM105 (suppressible-exception)
2024-03-10 07:56:49 -04:00
6a47133e3f
Fixed F811 (redefined-while-unused): Redefinition of unused `sys` from line 10
2024-03-10 07:56:49 -04:00
7f456d8e8b
Fixed ISC002 (multi-line-implicit-string-concatenation): Implicitly concatenated string literals over multiple lines
2024-03-10 07:56:49 -04:00
e466b9bb53
Fixed RUF005 (collection-literal-concatenation)
2024-03-10 07:56:49 -04:00
0e9193651d
Fixed PLW1514 (unspecified-encoding): `open` in text mode without explicit `encoding` argument
2024-03-10 07:56:49 -04:00
a02b59d4e4
Fixed F401 (unused-import): `socket.timeout` imported but unused
2024-03-10 07:56:49 -04:00
15bddcbc39
Fixed RUF010 (explicit-f-string-type-conversion): Use explicit conversion flag
2024-03-10 07:56:49 -04:00
c719fce40a
Fixed UP032 (f-string): Use f-string instead of `format` call
2024-03-10 07:56:49 -04:00
3111cf56de
Fixed EM102 (f-string-in-exception): Exception must not use an f-string literal, assign to variable first
2024-03-10 07:56:49 -04:00
6508d47da1
Fixed C405 (unnecessary-literal-set): Unnecessary `list` literal (rewrite as a `set` literal)
2024-03-10 07:56:49 -04:00
9b961b7ba0
Fixed UP024 (os-error-alias): Replace aliased errors with `OSError`
2024-03-10 07:56:49 -04:00
b13cef9b1d
Fixed PIE790 (unnecessary-placeholder): Unnecessary `pass` statement
2024-03-10 07:56:49 -04:00
8b9d3ec094
Fixed W292 (missing-newline-at-end-of-file): No newline at end of file
2024-03-10 07:56:49 -04:00
d1d3d08d70
Fixed B006 (mutable-argument-default): Do not use mutable data structures for argument defaults
2024-03-10 07:56:49 -04:00
922c59ddaf
Fixed SIM212 (if-expr-with-twisted-arms): Use `with_lines if with_lines else []` instead of `[] if not with_lines else with_lines`
2024-03-10 07:56:49 -04:00
20a99c0ab8
Fixed UP041 (timeout-error-alias): Replace aliased errors with `TimeoutError`
2024-03-10 07:56:49 -04:00
54af4725f9
Fixed C404 (unnecessary-list-comprehension-dict): Unnecessary `list` comprehension (rewrite as a `dict` comprehension)
2024-03-10 07:56:49 -04:00
fd4fcdaf53
Fixed E712 (true-false-comparison): Comparison to `False` should be `cond is False` or `if not cond:`
2024-03-10 07:56:49 -04:00
d661d623dc
Fixed RUF017 (quadratic-list-summation): Avoid quadratic list summation
2024-03-10 07:56:49 -04:00
f621789298
Fixed SIM118 (in-dict-keys): Use `key in dict` instead of `key in dict.keys()`
2024-03-10 07:56:49 -04:00
ec32e1d578
Fixed E703 (useless-semicolon): Statement ends with an unnecessary semicolon
2024-03-10 07:56:49 -04:00
57dcd4bb51
Fixed E713 (not-in-test): Test for membership should be `not in`
2024-03-10 07:56:49 -04:00
845393b6e0
Fixed RET503 (implicit-return): Missing explicit `return` at the end of function able to return non-`None` value
2024-03-10 07:56:49 -04:00
c585c1ecf6
Fixed W291 (trailing-whitespace): Trailing whitespace
2024-03-10 07:56:49 -04:00
e0e6f1081b
Fixed C414 (unnecessary-double-cast-or-process): Unnecessary `list` call within `sorted()`
2024-03-10 07:56:49 -04:00
4999ed7b1c
Fixed Q003 (avoidable-escaped-quote): Change outer quotes to avoid escaping inner quotes
2024-03-10 07:54:51 -04:00
ca8f06d590
Fixed PLR1711 (useless-return): Useless `return` statement at end of function
2024-03-10 07:54:51 -04:00
57d05c1ab2
Fixed B007 (unused-loop-control-variable)
2024-03-10 07:54:51 -04:00
c953e5784d
Fixed C401 (unnecessary-generator-set): Unnecessary generator (rewrite as a `set` comprehension)
2024-03-10 07:54:51 -04:00
81a4da0181
Fixed SIM110 (reimplemented-builtin)
2024-03-10 07:54:51 -04:00
99d3929f99
Fixed E711 (none-comparison)
2024-03-10 07:54:51 -04:00
541f31b1ba
Fixed FURB113 (repeated-append)
2024-03-10 07:54:51 -04:00
e8d1c037cb
Fixed SIM102 (collapsible-if): Use a single `if` statement instead of nested `if` statements
2024-03-10 07:54:51 -04:00
67b9d0b279
Fixed PLW0108 (unnecessary-lambda): Lambda may be unnecessary; consider inlining inner function
2024-03-10 07:54:51 -04:00
3d72c32b1d
Fixed W605 (invalid-escape-sequence)
2024-03-10 07:54:51 -04:00
14a5613dc8
Fixed UP031 (printf-string-formatting): Use format specifiers instead of percent format
2024-03-10 07:54:51 -04:00
64540fbb44
Fixed UP034 (extraneous-parentheses): Avoid extraneous parentheses
2024-03-10 07:54:51 -04:00
eefc0514b2
Fixed UP030 (format-literals): Use implicit references for positional format fields
2024-03-10 07:54:51 -04:00
KiekerJan
Joshua Tauberer
Crag-Monkey
Bastian Bittorf
Teal Dulcet