From 4cb13d5d0869f2c2ca44585408f0b2cdf284c42f Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Wed, 25 Nov 2020 23:08:38 -0600 Subject: [PATCH] Remove unnecessary LEGACY_WARNING_ISSUED flag --- test/test_unit_issue_legacy_path_warning.py | 4 +--- yadm | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/test/test_unit_issue_legacy_path_warning.py b/test/test_unit_issue_legacy_path_warning.py index ed6fbe5..da652c0 100644 --- a/test/test_unit_issue_legacy_path_warning.py +++ b/test/test_unit_issue_legacy_path_warning.py @@ -31,13 +31,11 @@ def test_legacy_warning(tmpdir, runner, yadm, upgrade, override, legacy_path): {override} set_yadm_dirs issue_legacy_path_warning - echo "LWI:$LEGACY_WARNING_ISSUED" """ run = runner(command=['bash'], inp=script) assert run.success assert run.err == '' if legacy_path and (not upgrade) and (not override): assert 'Legacy paths have been detected' in run.out - assert 'LWI:1' in run.out else: - assert run.out.rstrip() == 'LWI:0' + assert 'Legacy paths have been detected' not in run.out diff --git a/yadm b/yadm index 04ba034..b2b07f6 100755 --- a/yadm +++ b/yadm @@ -61,8 +61,6 @@ ENCRYPT_INCLUDE_FILES="unparsed" GPG_OPTS=() OPENSSL_OPTS=() -LEGACY_WARNING_ISSUED=0 - # flag causing path translations with cygpath USE_CYGPATH=0 @@ -1595,9 +1593,6 @@ function issue_legacy_path_warning() { ${path_list} *********** EOF - -LEGACY_WARNING_ISSUED=1 - } function configure_paths() {