| index : archweb32 | |
| Archlinux32 website | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | buildmaster/mysql-issues.php | 8 | ||||
| -rw-r--r-- | buildmaster/status.php | 5 | ||||
| -rw-r--r-- | buildmaster/to-delete.php | 2 |
diff --git a/buildmaster/mysql-issues.php b/buildmaster/mysql-issues.php index e6e557d..684c44c 100644 --- a/buildmaster/mysql-issues.php +++ b/buildmaster/mysql-issues.php @@ -17,7 +17,7 @@ "`binary_packages`.`sub_pkgrel`,\"-\"," . "`architectures`.`name`) AS `pkgfile`," . "`install_targets`.`name` AS `install_target`," . - "IF(`binary_packages`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`," . + "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`," . "`subst_r`.`name` AS `subst_repository`," . "`subst_buildlist_bp`.`id` AS `subst_buildlist`" . " FROM `binary_packages`" . @@ -48,7 +48,7 @@ ")" . $ignore . " ORDER BY " . - "`binary_packages`.`is_to_be_deleted`," . + "`binary_packages_in_repositories`.`is_to_be_deleted`," . "`repositories`.`name`," . "`binary_packages`.`pkgname`," . "`install_targets`.`name`" @@ -69,7 +69,7 @@ "`architectures`.`name`) AS `pkgfile`," . "`install_targets`.`name` AS `install_target`," . "`repository_stabilities`.`name` AS `stability`," . - "IF(`binary_packages`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . + "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . " FROM `binary_packages`" . " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" . " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" . @@ -94,7 +94,7 @@ " AND `repositories`.`stability`=`repository_stability_relations`.`less_stable`" . ")" . $ignore . - " ORDER BY `is_to_be_deleted`,`binary_packages`.`pkgname`,`install_targets`.`name`" + " ORDER BY `binary_packages_in_repositories`.`is_to_be_deleted`,`binary_packages`.`pkgname`,`install_targets`.`name`" ); $stability_issues = array(); diff --git a/buildmaster/status.php b/buildmaster/status.php index 46c2fc1..2b1bd11 100644 --- a/buildmaster/status.php +++ b/buildmaster/status.php @@ -24,10 +24,11 @@ if ($result -> num_rows > 0) { } $result = mysql_run_query( - "SELECT MAX(`binary_packages`.`last_moved`) AS `last_moved`" . + "SELECT MAX(`binary_packages_in_repositories`.`last_moved`) AS `last_moved`" . " FROM `binary_packages`" . + " JOIN `binary_packages_in_repositories` ON `binary_packages_in_repositories`.`package`=`binary_packages`.`id`" . " JOIN `build_assignments` ON `binary_packages`.`build_assignment`=`build_assignments`.`id`" . - " WHERE `binary_packages`.`last_moved`>`build_assignments`.`return_date`" + " WHERE `binary_packages_in_repositories`.`last_moved`>`build_assignments`.`return_date`" ); if ($result -> num_rows > 0) { diff --git a/buildmaster/to-delete.php b/buildmaster/to-delete.php index 67d9a28..27b0678 100644 --- a/buildmaster/to-delete.php +++ b/buildmaster/to-delete.php @@ -15,7 +15,7 @@ "JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id` " . " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" . " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" . - "WHERE `binary_packages`.`is_to_be_deleted` " . + "WHERE `binary_packages_in_repositories`.`is_to_be_deleted` " . "AND `repositories`.`is_on_master_mirror`" ); |