From d20cbe6c6d3da355fc7ab0d5d358a395dbd41727 Mon Sep 17 00:00:00 2001 From: Alejandro R Mosteo Date: Tue, 2 Jun 2020 12:22:26 +0200 Subject: [PATCH] Report expected vs found index versions (#419) --- src/alire/alire-toml_index.adb | 8 ++++++-- testsuite/tests/index/bad-index-version/test.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/alire/alire-toml_index.adb b/src/alire/alire-toml_index.adb index 7bb5adfd..52cebce3 100644 --- a/src/alire/alire-toml_index.adb +++ b/src/alire/alire-toml_index.adb @@ -213,11 +213,15 @@ package body Alire.TOML_Index is if Alire.Index.Version < Version then Set_Error (Result, Filename, - "index version is newer than that expected by alr." + "index version (" & Version.Image + & ") is newer than that expected by alr (" + & Alire.Index.Version.Image & ")." & " You may have to update alr"); elsif Version < Alire.Index.Version then Set_Error (Result, Filename, - "index version is older than that expected by alr." + "index version (" & Version.Image + & ") is older than that expected by alr (" + & Alire.Index.Version.Image & ")." & " Please update your local index " & "(alr index --update-all)"); end if; diff --git a/testsuite/tests/index/bad-index-version/test.py b/testsuite/tests/index/bad-index-version/test.py index f8e7d254..c09578ae 100644 --- a/testsuite/tests/index/bad-index-version/test.py +++ b/testsuite/tests/index/bad-index-version/test.py @@ -8,7 +8,7 @@ from drivers.asserts import assert_match p = run_alr('list', complain_on_error=False) assert_match( - '.*index version is older than that expected by alr.*', + '.*index version \(0\.0\.0\) is older than that expected by alr \(.*\).*', p.out) print('SUCCESS') -- 2.39.5