From b50a88884e642a4747327402cd5cff696d440918 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 7 Feb 2021 14:48:42 +0100 Subject: rpki: T3293: bugfix for config migration when cache and address name match If the RPKI cache name equals the configured address, renaming is not possible, as rename expects the new path to not exist. (cherry picked from commit af2a22fb114b7d00f50fb32dc64b49e132ccca61) --- src/migration-scripts/rpki/0-to-1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/migration-scripts/rpki/0-to-1 b/src/migration-scripts/rpki/0-to-1 index 9058af016..5b4893205 100755 --- a/src/migration-scripts/rpki/0-to-1 +++ b/src/migration-scripts/rpki/0-to-1 @@ -48,7 +48,12 @@ if config.exists(base + ['cache']): # Increase preference for the next caching peer - actually VyOS 1.2 # supported only one but better save then sorry (T3253) preference += 1 - config.rename(base + ['cache', cache], address) + + # T3293: If the RPKI cache name equals the configured address, + # renaming is not possible, as rename expects the new path to not + # exist. + if not config.exists(base + ['cache', address]): + config.rename(base + ['cache', cache], address) try: with open(file_name, 'w') as f: -- cgit v1.2.3