diff --git a/src/alire/alire-index_on_disk.adb b/src/alire/alire-index_on_disk.adb index bea0c467d..1260a19e0 100644 --- a/src/alire/alire-index_on_disk.adb +++ b/src/alire/alire-index_on_disk.adb @@ -173,7 +173,7 @@ package body Alire.Index_On_Disk is Dir : constant Virtual_File := Create (+Path); begin if not Dir.Is_Directory then - Result := Outcome_Failure ("Not a readable directory"); + Result := Outcome_Failure ("Not a readable directory: " & Path); return New_Invalid_Index; end if; diff --git a/testsuite/tests/index/local-index-not-found/test.py b/testsuite/tests/index/local-index-not-found/test.py index bc571e7ae..69ba36611 100644 --- a/testsuite/tests/index/local-index-not-found/test.py +++ b/testsuite/tests/index/local-index-not-found/test.py @@ -3,6 +3,7 @@ """ import os +import os.path import re from e3.fs import rm @@ -10,7 +11,6 @@ from drivers.alr import prepare_indexes, run_alr from drivers.asserts import assert_match - for d in ('no-such-directory', 'file://no-such-directory', ): rm('alr-config', recursive=True) @@ -20,10 +20,11 @@ path_excerpt = os.path.join('alr-config', 'indexes', 'bad_index', 'index.toml') + separator = re.escape(os.path.sep) assert_match('ERROR: Cannot load metadata from .*{}:' - ' Not a readable directory' + ' Not a readable directory: .{}{}' '\n' - .format(re.escape(path_excerpt)), + .format(re.escape(path_excerpt), separator, d), p.out) print('SUCCESS')