[llvm-commits] CVS: nightlytest-serverside/NightlyTestAccept.php

[Jim Laskey]

Changes in directory nightlytest-serverside:

NightlyTestAccept.php updated: 1.57 -> 1.58
---
Log message:

Make sure we use the exact machine for id

---
Diffs of the changes:  (+3 -9)

 NightlyTestAccept.php |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)


Index: nightlytest-serverside/NightlyTestAccept.php
diff -u nightlytest-serverside/NightlyTestAccept.php:1.57 nightlytest-serverside/NightlyTestAccept.php:1.58
--- nightlytest-serverside/NightlyTestAccept.php:1.57	Wed Sep 20 06:09:02 2006
+++ nightlytest-serverside/NightlyTestAccept.php	Wed Sep 20 06:31:36 2006
@@ -138,18 +138,13 @@
  *
  *******************************************************************************/
 function DoesMachineExist($uname, $hardware, $os, $name, $nickname, $gcc_version) {
-  $query = "SELECT * FROM machine WHERE uname=\"$uname\" AND nickname=\"$nickname\" AND gcc=\"$gcc_version\"";
+  $query = "SELECT * FROM machine WHERE uname=\"$uname\" AND hardware=\"$hardware\" AND os=\"$os\" AND nickname=\"$nickname\" AND gcc=\"$gcc_version\"";
 
   $machine_query = mysql_query($query) or die(mysql_error());
   $row = mysql_fetch_assoc($machine_query);
   mysql_free_result($machine_query);
     
-  if($row &&
-     StringEqual($row['uname'], $uname) &&
-     StringEqual($row['hardware'], $hardware) &&
-     StringEqual($row['os'], $os) &&
-     StringEqual($row['nickname'], $nickname) &&
-     StringEqual($row['gcc'], $gcc_version)) {
+  if ($row) {
     return true;
   }
 
@@ -190,8 +185,7 @@
  *
  *******************************************************************************/
 function GetMachineId($uname, $hardware, $os, $name, $nickname, $gcc_version) {
-  $query = "SELECT * FROM machine WHERE uname=\"$uname\" AND hardware=\"$hardware\" ".
-           "AND os=\"$os\" AND name=\"$name\" AND gcc=\"$gcc_version\"";
+  $query = "SELECT * FROM machine WHERE uname=\"$uname\" AND hardware=\"$hardware\" AND os=\"$os\" AND nickname=\"$nickname\" AND gcc=\"$gcc_version\"";
   $machine_query = mysql_query($query) or die(mysql_error());
   $row = mysql_fetch_assoc($machine_query);
   mysql_free_result($machine_query);