summaryrefslogtreecommitdiff
path: root/buildmaster
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-02-22 10:35:08 +0100
committerErich Eckner <git@eckner.net>2019-02-22 10:35:08 +0100
commitbc4b84d128177e7b640dfac901161e00c100e439 (patch)
tree8d0fa059770bd852f927aa7fca30af9ab2845fc0 /buildmaster
parenta9b7ef03f1a574169f65303f37654223d980db41 (diff)
downloadwebsite-bc4b84d128177e7b640dfac901161e00c100e439.tar.xz
lib/helper.php: available_upstream_packages() new
Diffstat (limited to 'buildmaster')
-rw-r--r--buildmaster/deletion-links.php14
-rw-r--r--buildmaster/to-delete.php6
2 files changed, 4 insertions, 16 deletions
diff --git a/buildmaster/deletion-links.php b/buildmaster/deletion-links.php
index f26208a..54329bb 100644
--- a/buildmaster/deletion-links.php
+++ b/buildmaster/deletion-links.php
@@ -1,5 +1,6 @@
<?php
require_once "../init.php";
+require_once BASE . "/lib/helper.php";
require_once BASE . "/lib/mysql.php";
$edges = "";
@@ -15,18 +16,7 @@ if (array_key_exists("pkgname", $_GET))
else
$filter = "";
-$available_upstream_packages = apcu_fetch('available_upstream_packages', $apcu_success);
-if ($apcu_success == false) {
- $available_upstream_packages = explode(
- "\n",
- shell_exec(
- "find /var/lib/pacman/ -name '*.db' -exec tar -tzf {} \; " .
- "| sed -n 's,-[^-]\+-[^-]\+/$,,;T;p' " .
- "| sort -u"
- )
- );
- apcu_store('available_upstream_packages', $available_upstream_packages, 1800);
-}
+$available_upstream_packages = available_upstream_packages('pkgname');
mysql_run_query(
"CREATE TEMPORARY TABLE `available` (" .
diff --git a/buildmaster/to-delete.php b/buildmaster/to-delete.php
index df11750..579bd62 100644
--- a/buildmaster/to-delete.php
+++ b/buildmaster/to-delete.php
@@ -1,5 +1,6 @@
<?php
require_once "../init.php";
+require_once BASE . "/lib/helper.php";
require_once BASE . "/lib/mysql.php";
$result = mysql_run_query(
@@ -19,10 +20,7 @@ require_once BASE . "/lib/mysql.php";
"AND `repositories`.`is_on_master_mirror`"
);
- $available = explode(
- "\n",
- shell_exec("find /var/lib/pacman/ -name '*.db' -exec tar -tzf {} \; | sed -n 's,-[^-]\+-[^-]\+/$,,;T;p'")
- );
+ $available = available_upstream_packages('pkgname');
$available = array_combine( $available, $available);
?>
<html>