From bc4b84d128177e7b640dfac901161e00c100e439 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 22 Feb 2019 10:35:08 +0100
Subject: lib/helper.php: available_upstream_packages() new

---
 buildmaster/deletion-links.php | 14 ++------------
 buildmaster/to-delete.php      |  6 ++----
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'buildmaster')
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>
-- 
cgit v1.2.3-70-g09d2

