Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions cfbs/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -740,11 +740,9 @@ def update_command(to_update):
continue
elif local_ver > index_ver:
log.warning(
"The requested version of module '%s' is older than current version (%s < %s)."
" Skipping its update."
% (old_module["name"], index_info["version"], old_module["version"])
"Downgrading module '%s' from %s to %s."
% (old_module["name"], old_module["version"], index_info["version"])
)
continue

new_module = index_info
update_objects.append(update)
Expand Down
14 changes: 7 additions & 7 deletions tests/shell/050_update_masterfiles_specific_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ cfbs validate
cfbs --non-interactive update masterfiles@3.24.4
[ "$(mf version)" = "3.24.4" ]

# Asking for an older version than the current one must not downgrade.
# Downgrading to an older version is allowed.
cfbs --non-interactive update masterfiles@3.24.1
[ "$(mf version)" = "3.24.4" ]
[ "$(mf version)" = "3.24.1" ]
[ "$(mf commit)" = "1171e2e50a229d78e2fdd4357a5d07ecc19bdbf4" ]
cfbs validate

# A plain update (no @version) still moves to a strictly newer version than the
# pin. Checking "!= 3.24.4" alone would also pass on a downgrade, so verify that
# 3.24.4 sorts before the new version (i.e. the new version is the greater one).
# A plain update (no @version) moves to the newest version available.
cfbs --non-interactive update masterfiles
new_ver="$(mf version)"
[ "$new_ver" != "3.24.4" ]
[ "$(printf '%s\n%s\n' "3.24.4" "$new_ver" | sort -V | tail -1)" = "$new_ver" ]
[ "$new_ver" != "3.24.1" ]
[ "$(printf '%s\n%s\n' "3.24.1" "$new_ver" | sort -V | tail -1)" = "$new_ver" ]

cfbs build
Loading