Use global list format string

[buildfarm-server.git] / scripts / approve_system.pl

diff --git a/scripts/approve_system.pl b/scripts/approve_system.pl
index 7a36db716759d3e200a5590f7c2c44429120b70b..9a7457d8b633b604be287a8ca336374309b7267c 100755 (executable)
--- a/scripts/approve_system.pl
+++ b/scripts/approve_system.pl
@@ -8,6 +8,7 @@ use Data::Dumper;
 die "Must pass current sysname and new sysname\n" unless scalar @ARGV == 2;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport
+            $user_list_format
 );
 require "$ENV{BFConfDir}/BuildFarmWeb.pl";
 
@@ -22,10 +23,6 @@ my $db = DBI->connect($dsn,$dbuser,$dbpass);
 
 die $DBI::errstr unless $db;
 
-#my $sth_up = $db->prepare(q[
-#       SELECT approve(?, ?)
-#      ]);
-#$sth_up->execute(@ARGV);
 $db->do('SELECT approve(?, ?)', undef, @ARGV);
 
 my $sth = $db->prepare(q[ 
@@ -35,11 +32,12 @@ my $sth = $db->prepare(q[
       ]);
 $sth->execute();
 
-my $format = "%-10s %-10s %-18s %-20s %-18s %-s\n";
-printf $format, "SysName", "Status", "Owner", "Email", "Distro", "Version";
+printf $user_list_format,
+       "SysName", "Status", "Owner", "Email", "Distro", "Version";
 while (my $row = $sth->fetchrow_hashref)
 {
-  printf $format, $row->{name}, $row->{status}, $row->{sys_owner},
+  printf $user_list_format,
+                  $row->{name}, $row->{status}, $row->{sys_owner},
                   $row->{owner_email}, $row->{operating_system},
                   $row->{os_version};
 }