@@ -554,35 +554,44 @@ def show_archive(
554554# You should print it when calling as_text=true
555555return self .run (cmd_list + options ,old_binary = old_binary ,expect_error = expect_error )
556556
557+ result = {}
558+ instance_timelines = None
559+
557560if as_json :
558561if as_text :
559562data = self .run (cmd_list + options ,old_binary = old_binary ,expect_error = expect_error )
560563else :
561564data = json .loads (self .run (cmd_list + options ,old_binary = old_binary ,expect_error = expect_error ))
562565
563566if instance :
564- instance_timelines = None
565567for instance_name in data :
566568if instance_name ['instance' ]== instance :
567569instance_timelines = instance_name ['timelines' ]
568570break
569571
570572if tli > 0 :
573+ timeline_found = False
571574for timeline in instance_timelines :
572575if timeline ['tli' ]== tli :
573- return timeline
574-
575- return {}
576-
577- if instance_timelines :
578- return instance_timelines
579-
580- return data
576+ result = timeline
577+ timeline_found = True
578+ break
579+ if not timeline_found :
580+ result = {}
581+
582+ elif instance_timelines :
583+ result = instance_timelines
584+ else :
585+ result = data
586+ else :
587+ result = data
581588else :
582- show_splitted = self .run (cmd_list + options ,old_binary = old_binary ,
583- expect_error = expect_error ).splitlines ()
584- logging .error (show_splitted )
589+ show_splitted = self .run (cmd_list + options ,old_binary = old_binary ,expect_error = expect_error ).splitlines ()
590+ print (show_splitted )
585591exit (1 )
592+ if result == {}:
593+ print (f"tli={ tli } { instance_timelines } )
594+ return result
586595
587596def validate (
588597self ,instance = None ,backup_id = None ,
