From 695da485c8d263eecff8bdbada67014b99bba2ef Mon Sep 17 00:00:00 2001
From: Kirill Solomko <ksolomko@sipwise.com>
Date: Fri, 13 Feb 2026 16:58:01 +0100
Subject: [PATCH] MT#64441 return 1 from do_sync_db_timezones() on when ok

* 1 is returned in do_sync_db_timezones() when no errors
  occured, including version match, to let dependent functions
  be called properly in the chain.
* move mysql_tzinfo_to_sql capture after version comparsion
  so that the data is not gathered needlessly.

Change-Id: I88ab0ef67ee40da064b9884c65b27d542550dd8f
---
 helper/sync-db | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/helper/sync-db b/helper/sync-db
index 647ea95e..7edb77cd 100755
--- a/helper/sync-db
+++ b/helper/sync-db
@@ -315,15 +315,6 @@ sub do_sync_db_timezones {
     my $dbh = $db_conn->{$db_conn_type};
     my ($dbhost, $dbport) = @{$db_info->{$db_conn_type}}{qw(host port)};
 
-    my ($out, $err, $rc) = capture {
-        system('/usr/bin/mysql_tzinfo_to_sql /usr/share/zoneinfo');
-    };
-
-    if ($rc) {
-        print "Error: $err\n";
-        return;
-    }
-
     my ($tzinfo_version, undef, undef) = capture {
         system('dpkg-query -f "\${Version}" -W tzdata');
     };
@@ -343,11 +334,20 @@ SQL
             or die "Cannot select from ngcp.tzinfo_version: $DBI::errstr\n";
 
         if ($cur_tzinfo_version eq $tzinfo_version) {
-            return;
+            return 1;
         }
 
         print "sync db timezones on host=$dbhost port=$dbport old=$cur_tzinfo_version new=$tzinfo_version\n";
 
+        my ($out, $err, $rc) = capture {
+            system("/usr/bin/mysql_tzinfo_to_sql /usr/share/zoneinfo");
+        };
+
+        if ($rc) {
+            print "Error: $err\n";
+            return;
+        }
+
         open(my $sql_stream, "<", \$out)
             or die "Cannot open sql stream: $ERRNO\n";
         binmode($sql_stream);
@@ -377,7 +377,7 @@ INSERT INTO ngcp.tzinfo_version SET version = ?
 SQL
             or die "Cannot insert into ngcp.tzinfo_version: $DBI::errstr\n";
     };
-    $err = $EVAL_ERROR;
+    my $err = $EVAL_ERROR;
     if ($err) {
         print $err;
         $dbh->rollback();
@@ -409,7 +409,7 @@ SQL
             or die "Cannot select from ngcp.timezone: $DBI::errstr\n";
 
         if ($cur_tz_version eq $olson_tz_version) {
-            return;
+            return 1;
         }
 
         my %links = DateTime::TimeZone->links;