Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/buildmaster
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-20 20:12:24 +0100
committerErich Eckner <git@eckner.net>2019-01-20 20:12:24 +0100
commit225fef295a1f6e9187c0ffc96eb85d8108ce89bb (patch)
tree84af916da0fcff6b421f1e6fdaccd9c0287dc054 /buildmaster
parenteec594a89a7c59b90357c6a0d9ca4a5f481dfb57 (diff)
use mysql_query_package_version() even more often
Diffstat (limited to 'buildmaster')
-rw-r--r--buildmaster/dependencies.php6
-rw-r--r--buildmaster/mysql-issues.php12
2 files changed, 6 insertions, 12 deletions
diff --git a/buildmaster/dependencies.php b/buildmaster/dependencies.php
index 1c81745..a8beb5d 100644
--- a/buildmaster/dependencies.php
+++ b/buildmaster/dependencies.php
@@ -135,10 +135,8 @@ $pkgfile_query =
"CONCAT(".
"`repositories`.`name`,\"/\"," .
"`binary_packages`.`pkgname`,\"-\"," .
- "IF(`binary_packages`.`epoch`=0,\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
- "`binary_packages`.`pkgver`,\"-\"," .
- "`binary_packages`.`pkgrel`,\".\"," .
- "`binary_packages`.`sub_pkgrel`,\"-\"," .
+ mysql_query_package_version("binary_packages") .
+ ",\"-\"," .
"`architectures`.`name`" .
") AS `filename`";
diff --git a/buildmaster/mysql-issues.php b/buildmaster/mysql-issues.php
index 0c27608..1397141 100644
--- a/buildmaster/mysql-issues.php
+++ b/buildmaster/mysql-issues.php
@@ -30,10 +30,8 @@ require_once BASE . "/lib/mysql.php";
"`r_a`.`name`,\"/\"," .
"`repositories`.`name`,\"/\"," .
"`binary_packages`.`pkgname`,\"-\"," .
- "IF(`binary_packages`.`epoch`=0,\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
- "`binary_packages`.`pkgver`,\"-\"," .
- "`binary_packages`.`pkgrel`,\".\"," .
- "`binary_packages`.`sub_pkgrel`,\"-\"," .
+ mysql_query_package_version("binary_packages") .
+ ",\"-\"," .
"`architectures`.`name`) AS `pkgfile`," .
"`install_targets`.`name` AS `install_target`," .
"IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`," .
@@ -109,10 +107,8 @@ require_once BASE . "/lib/mysql.php";
"`r_a`.`name`,\"/\"," .
"`repositories`.`name`,\"/\"," .
"`binary_packages`.`pkgname`,\"-\"," .
- "IF(`binary_packages`.`epoch`=0,\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
- "`binary_packages`.`pkgver`,\"-\"," .
- "`binary_packages`.`pkgrel`,\".\"," .
- "`binary_packages`.`sub_pkgrel`,\"-\"," .
+ mysql_query_package_version("binary_packages") .
+ ",\"-\"," .
"`architectures`.`name`) AS `pkgfile`," .
"`install_targets`.`name` AS `install_target`," .
"`repository_stabilities`.`name` AS `stability`," .