From 28d93bb66fa28fbce195e36bf50763efb370a63b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sat, 14 Apr 2018 12:25:29 +0200 Subject: packages/pkginfo.php: ignore .0 sub_pkgrel if necessary --- packages/pkginfo.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/pkginfo.php b/packages/pkginfo.php index b8d280f..ccc3522 100644 --- a/packages/pkginfo.php +++ b/packages/pkginfo.php @@ -60,13 +60,15 @@ $same_keys = array ( array("mysql" => "pkgname", "json" => "Name"), - array("mysql" => "version", "json" => "Version"), + array("mysql" => "version", "json" => "Version", "suffix_diff" => ".0"), array("mysql" => "repo", "json" => "Repository"), array("mysql" => "arch", "json" => "Architecture") ); foreach ($same_keys as $same_key) - if ($mysql_content[$same_key["mysql"]] != $json_content[$same_key["json"]]) + if (($mysql_content[$same_key["mysql"]] != $json_content[$same_key["json"]]) && + ((!isset($same_key["suffix_diff"])) || + ($mysql_content[$same_key["mysql"]] != $json_content[$same_key["json"]].$same_key["suffix_diff"]))) die_500("Inconsistency in Database found:
\n" . "buildmaster[" . $same_key["mysql"] . "] != repositories[" . $same_key["json"] . "]:
\n" . "\"" . $mysql_content[$same_key["mysql"]] . "\" != \"" . $json_content[$same_key["json"]] . "\""); -- cgit v1.2.3