New server, FileBin instead of $ENV{BFConfDir}, and custom Captcha

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

diff --git a/scripts/delete_unlisted_branches.pl b/scripts/delete_unlisted_branches.pl
index 03df7969f15dceaaa1302b3fda19e389fe8b1566..2dba66ce6c95146a8d3d7192656ed35c6005ca1d 100755 (executable)
--- a/scripts/delete_unlisted_branches.pl
+++ b/scripts/delete_unlisted_branches.pl
@@ -7,7 +7,9 @@ use Data::Dumper;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport
 );
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
+
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";
 
 die "no dbname" unless $dbname;
 die "no dbuser" unless $dbuser;
@@ -21,7 +23,7 @@ my $db = DBI->connect($dsn,$dbuser,$dbpass);
 die $DBI::errstr unless $db;
 
 my ($brhandle,@branches_of_interest);
-if (open($brhandle,"$ENV{BFConfDir}/htdocs/branches_of_interest.txt"))
+if (open($brhandle,"/home/farm/server/htdocs/branches_of_interest.txt"))
 {
     @branches_of_interest = <$brhandle>;
     close($brhandle);
@@ -47,7 +49,11 @@ my $del_dash_sth = $db->prepare(q[
        WHERE sysname = ?
        AND branch = ?
       ]);
-
+my $del_snap_sth = $db->prepare(q[
+       DELETE FROM latest_snapshot
+       WHERE sysname = ?
+       AND branch = ?
+      ]);
 while (my $row = $sth->fetchrow_hashref)
 {
   my $sysname = $row->{sysname};
@@ -58,6 +64,7 @@ while (my $row = $sth->fetchrow_hashref)
     print "** Delete branch $branch\n";
     $del_sth->execute($sysname,$branch);
     $del_dash_sth->execute($sysname,$branch);
+    $del_snap_sth->execute($sysname,$branch);
   }
 }
 $db->disconnect();