diff options
| author | Erich Eckner <deep42thought@noreply.example.org> | 2018-06-19 17:49:43 +0000 |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2018-06-19 17:49:43 +0000 |
| commit | 4eaa80ae7e67bbadf4b6cdd4634496368dc451d5 (patch) | |
| tree | 2945adcd6fa5a2cb8485060c2a2bc57b27fbb290 /buildmaster | |
| parent | 1e8cfa2306848879b4fa4b39fb60e80389d3d808 (diff) | |
| parent | 9d5b807d4944fa05c68fd38be1f9705f40137238 (diff) | |
| download | archweb32-4eaa80ae7e67bbadf4b6cdd4634496368dc451d5.tar.xz | |
Merge branch 'fix-include-path' of archlinux32/archweb32 into master
Diffstat (limited to 'buildmaster')
| -rw-r--r-- | buildmaster/blacklist.php | 3 | ||||
| -rw-r--r-- | buildmaster/build-list-links.php | 4 | ||||
| -rw-r--r-- | buildmaster/build-list.php | 5 | ||||
| -rw-r--r-- | buildmaster/build-slaves.php | 4 | ||||
| -rw-r--r-- | buildmaster/deletion-links.php | 4 | ||||
| -rw-r--r-- | buildmaster/dependencies.php | 4 | ||||
| -rw-r--r-- | buildmaster/gpg-keys.php | 2 | ||||
| -rw-r--r-- | buildmaster/index.php | 4 | ||||
| -rw-r--r-- | buildmaster/log.php | 3 | ||||
| -rw-r--r-- | buildmaster/mysql-issues.php | 4 | ||||
| -rw-r--r-- | buildmaster/statistics.php | 4 | ||||
| -rw-r--r-- | buildmaster/status.php | 6 | ||||
| -rw-r--r-- | buildmaster/to-delete.php | 4 | ||||
| -rw-r--r-- | buildmaster/todos.php | 4 |
14 files changed, 30 insertions, 25 deletions
diff --git a/buildmaster/blacklist.php b/buildmaster/blacklist.php index fc49d42..4757a6e 100644 --- a/buildmaster/blacklist.php +++ b/buildmaster/blacklist.php @@ -1,6 +1,7 @@ <?php +require_once "../init.php" - include "lib/mysql.php"; +require_once BASE . "/lib/mysql.php"; $result = mysql_run_query( "SELECT DISTINCT `architectures`.`name` AS `architecture`,`package_sources`.`pkgbase`,`build_assignments`.`is_black_listed` " . diff --git a/buildmaster/build-list-links.php b/buildmaster/build-list-links.php index 7b0243e..3f924f8 100644 --- a/buildmaster/build-list-links.php +++ b/buildmaster/build-list-links.php @@ -1,6 +1,6 @@ <?php - -include "lib/mysql.php"; +require_once "../init.php"; +require_once BASE . "/lib/mysql.php"; $edges = ""; $knots = ""; diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php index 31d0dd6..4a1ecff 100644 --- a/buildmaster/build-list.php +++ b/buildmaster/build-list.php @@ -1,7 +1,8 @@ <?php +require_once "../init.php"; -include "lib/mysql.php"; -include "lib/style.php"; +require_once BASE . "/lib/mysql.php"; +require_once BASE . "/lib/style.php"; if (isset($_GET["show"])) $to_show=$_GET["show"]; diff --git a/buildmaster/build-slaves.php b/buildmaster/build-slaves.php index 651d661..978e99c 100644 --- a/buildmaster/build-slaves.php +++ b/buildmaster/build-slaves.php @@ -1,6 +1,6 @@ <?php - - include "lib/mysql.php"; +require_once "../init.php"; +require_once BASE . "/lib/mysql.php"; $result = mysql_run_query( "SELECT" . diff --git a/buildmaster/deletion-links.php b/buildmaster/deletion-links.php index 39df340..3f9af30 100644 --- a/buildmaster/deletion-links.php +++ b/buildmaster/deletion-links.php @@ -1,6 +1,6 @@ <?php - -include "lib/mysql.php"; +require_once "../init.php"; +require_once BASE . "/lib/mysql.php"; $edges = ""; $knots = ""; diff --git a/buildmaster/dependencies.php b/buildmaster/dependencies.php index dddb662..8eb4dc4 100644 --- a/buildmaster/dependencies.php +++ b/buildmaster/dependencies.php @@ -1,6 +1,6 @@ <?php - -include "lib/mysql.php"; +require_once "../init.php"; +require_once BASE . "/lib/mysql.php"; $match = ""; diff --git a/buildmaster/gpg-keys.php b/buildmaster/gpg-keys.php index b506b0c..a9cd564 100644 --- a/buildmaster/gpg-keys.php +++ b/buildmaster/gpg-keys.php @@ -1,4 +1,6 @@ <?php +require_once "../init.php" +require_once BASE . "/lib/mysql.php"; include "lib/mysql.php"; diff --git a/buildmaster/index.php b/buildmaster/index.php index a14a0ed..04ddca6 100644 --- a/buildmaster/index.php +++ b/buildmaster/index.php @@ -1,6 +1,6 @@ <?php - - include "lib/mysql.php"; +require_once "../init.php"; +require_once BASE . "/lib/mysql.php"; ?> <html> diff --git a/buildmaster/log.php b/buildmaster/log.php index 55ce955..effcb55 100644 --- a/buildmaster/log.php +++ b/buildmaster/log.php @@ -1,6 +1,7 @@ <?php +require_once "../init.php" +require_once BASE . "/lib/mysql.php"; - include "lib/mysql.php"; $filter = ""; if (isset($_GET["show"]) && diff --git a/buildmaster/mysql-issues.php b/buildmaster/mysql-issues.php index 6547a34..89e84e7 100644 --- a/buildmaster/mysql-issues.php +++ b/buildmaster/mysql-issues.php @@ -1,6 +1,6 @@ <?php - - include "lib/mysql.php"; +require_once "../init.php" +require_once BASE . "/lib/mysql.php"; if (isset($_GET["ignore-haskell"])) $ignore = " AND `install_targets`.`name` NOT LIKE \"libHS%\""; diff --git a/buildmaster/statistics.php b/buildmaster/statistics.php index 8c13548..fbfedf4 100644 --- a/buildmaster/statistics.php +++ b/buildmaster/statistics.php @@ -1,6 +1,6 @@ <?php - -include "lib/mysql.php"; +require_once "../init.php"; +require_once BASE . "/lib/mysql.php"; if (isset($_GET["from"])) $min_time="from_base64(\"" . base64_encode("-".$_GET["from"]) . "\")"; diff --git a/buildmaster/status.php b/buildmaster/status.php index 2b1bd11..64b9f06 100644 --- a/buildmaster/status.php +++ b/buildmaster/status.php @@ -1,7 +1,7 @@ <?php - -include "lib/mysql.php"; -include "lib/style.php"; +require_once "../init.php"; +include BASE . "/lib/mysql.php"; +include BASE . "/lib/style.php"; $result = mysql_run_query( "SELECT MAX(`package_sources`.`commit_time`) AS `last_commit`" . diff --git a/buildmaster/to-delete.php b/buildmaster/to-delete.php index da9ded9..6c5e547 100644 --- a/buildmaster/to-delete.php +++ b/buildmaster/to-delete.php @@ -1,6 +1,6 @@ <?php - - include "lib/mysql.php"; +require_once "../init.php"; +require_once BASE . "/lib/mysql.php"; $result = mysql_run_query( "SELECT " . diff --git a/buildmaster/todos.php b/buildmaster/todos.php index 3251778..b175350 100644 --- a/buildmaster/todos.php +++ b/buildmaster/todos.php @@ -1,6 +1,6 @@ <?php - -include "lib/mysql.php"; +require_once "../init.php"; +include BASE . "/lib/mysql.php"; $result = mysql_run_query( "SELECT DISTINCT " . |