psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 06:31:07 -05:00
Code Issues Releases Wiki Activity

Remove unnecessary LEGACY_WARNING_ISSUED flag

Browse source
This commit is contained in:
Tim Byrne 2020-11-25 23:08:38 -06:00
parent 13a3cdc8a8
commit 4cb13d5d08
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/test_unit_issue_legacy_path_warning.py
View file

@ -31,13 +31,11 @@ def test_legacy_warning(tmpdir, runner, yadm, upgrade, override, legacy_path):
{override} {override}
set_yadm_dirs set_yadm_dirs
issue_legacy_path_warning issue_legacy_path_warning
echo "LWI:$LEGACY_WARNING_ISSUED"
""" """
run = runner(command=['bash'], inp=script) run = runner(command=['bash'], inp=script)
assert run.success assert run.success
assert run.err == '' assert run.err == ''
if legacy_path and (not upgrade) and (not override): if legacy_path and (not upgrade) and (not override):
assert 'Legacy paths have been detected' in run.out assert 'Legacy paths have been detected' in run.out
assert 'LWI:1' in run.out
else: else:
assert run.out.rstrip() == 'LWI:0' assert 'Legacy paths have been detected' not in run.out

5
yadm
View file

@ -61,8 +61,6 @@ ENCRYPT_INCLUDE_FILES="unparsed"
GPG_OPTS=() GPG_OPTS=()
OPENSSL_OPTS=() OPENSSL_OPTS=()
LEGACY_WARNING_ISSUED=0
# flag causing path translations with cygpath # flag causing path translations with cygpath
USE_CYGPATH=0 USE_CYGPATH=0
@ -1595,9 +1593,6 @@ function issue_legacy_path_warning() {
${path_list} ${path_list}
*********** ***********
EOF EOF
LEGACY_WARNING_ISSUED=1
} }
function configure_paths() { function configure_paths() {