From patchwork Sat May 25 23:01:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Fleischer X-Patchwork-Id: 1121 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 5029BEDCBDDC for ; Sat, 25 May 2019 23:01:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001,T_DKIMWL_WL_HIGH=-0.01, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sat, 25 May 2019 23:01:11 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 5022D12D79C269; Sat, 25 May 2019 23:01:10 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Sat, 25 May 2019 23:01:10 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 251D02C616; Sat, 25 May 2019 23:01:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1558825270; bh=2IB8kTCDTh3qaNi/f/7pxsJWgi4JZQ0QoLET51Ogntc=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=RRE+hzmSebX8K9HhLvvSyH93++9l3n1X5WI7VZUU/ZNDMlP2Zbemr9IGJGL9GnXMr fLkCMOGGMc8CJbb7/vgifov0rqtfFsP1Maed2kLLG2bc98f2ixtOCqnejTueFretTT 67XmxNTgV3lai62KDjB9uIaBk5dKzWSHG2WucbsHtCrlZqCRDcoJl3rJTqFkS1OM5D gCJmBizUkZ3FWbYAqOCkNlYbl+ym9oGa8NYT7Y2mbBTLmvslN4fUxO4btg2/UvG/X1 xKH9NrcPSOCk/GI/JU0EE3VIXvQoGUCfqyGDua9i3qcyAOZjCR7He7nHOt4HaOcP5X slFGLrQaJc8SecZE9eDfC7nwVeV9P7AE2+DkinDE8KfKJu2nvI5/djdnLrYSZYG1HC B8zOYA1ybL61hkzr0g2KlU/I5cmgxAxxsRXksRVp2+8aPBKbHQI+sOSvkMjBtgrS20 +6F8mua6WZzWygrm35q2vNGQ6X0HNbyUBI7G1Ktd8oEA3inY5Qyet6TvpopPnsiB/7 63qJKuEPU8QaIMF1GxLvC1EK73+0eN/8oHPGo7G9g2h5S7Ij+2iB0SfVZGakS3UqRg B4afA2oa55Pwvs4IfJrd0i8rACdQvgsEZldTzyPs6CbFywvI94EA8e/nh/4utQYwbL fcv6cguCg4RjB2Il5+DUxbRw= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 8895B2C613 for ; Sat, 25 May 2019 23:01:07 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sat, 25 May 2019 23:01:07 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 4099012D79C264 for ; Sat, 25 May 2019 23:01:01 +0000 (UTC) Received: from localhost (unknown [45.62.217.169]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: lfleischer) by orion.archlinux.org (Postfix) with ESMTPSA id 20AB312D79C263 for ; Sat, 25 May 2019 23:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1558825260; bh=2IB8kTCDTh3qaNi/f/7pxsJWgi4JZQ0QoLET51Ogntc=; h=From:To:Subject:Date:In-Reply-To:References; b=XZlDE1AlOnVqBBKDZVSLYKYkI1ejOWR+HTjJpSYnRvMSRognJTvP4WCO8l+1FI9SG hCRK4olH3rWA4Q5s1YyUrefOqiuM/DwB+QN92l7Mh9r3FjxuYNigbjB1trhymywTTU KNYE468WuP3eQqGDQatsruhcEp42aQauksOnCZxeuAfym6HcxK93M9syMhPFHa75FD D/nfkSBcXBmU1d3TmvMO4cmwEbkrQWVAd0EvEZcD2NWHKkJE0iyck4/SuiTCqD2Ffp M9TAzcxlKdXTYR36UFhSki83/AhakDctwp1sScs3Jroyjvzv3osBf+PJ5g3Jl5wLzg N2uZ14E7Q6+1rpWFkd8NUoam7DwrdDhTGGIxbV3BA/OjfGWCEw4j/kdsf/ULR99c10 xNKy1R2kc96uMvIp47R11fLXAdE8FQ2HrLkpcJ0+NvEuM0N4OAY8J/vtMWBtRTk80L l1v2N2CXs43LJxFEIpjUReZMEu0K5HtH734jjN/4WmRCg4o9Rlyh9db6ia9YQBy2rm HZ26FDlJSQvHvypbBoN2dicLUvW3SrWRSR1h/D4rsyd8W3/cKL+5GllnPh1f90N6op Gud2UB0F1sklFUibmYNQghI2n6geetJE9LJxKGs1CVYDn6r1GBA99MgzaxfCEkN6a0 JY7tFw7mnOVckyULHHhpXPGI= From: Lukas Fleischer To: aur-dev@archlinux.org Subject: [PATCH v2] Display warning when flagging VCS packages Date: Sat, 25 May 2019 19:01:52 -0400 Message-Id: <20190525230152.6418-1-lfleischer@archlinux.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190525170733.25076-1-lfleischer@archlinux.org> References: <20190525170733.25076-1-lfleischer@archlinux.org> MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" VCS packages should not be flagged out-of-date when the package version does not match the most recent commit. Implements FS#62733. Signed-off-by: Lukas Fleischer --- web/html/css/aurweb.css | 4 ++++ web/html/pkgflag.php | 9 +++++++++ web/lib/pkgbasefuncs.inc.php | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index ef37bf5..81bf9ab 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -195,3 +195,7 @@ label.confirmation, .comments .more { font-weight: normal; } + +.error { + color: red; +} diff --git a/web/html/pkgflag.php b/web/html/pkgflag.php index 61346b9..9cc6d7a 100644 --- a/web/html/pkgflag.php +++ b/web/html/pkgflag.php @@ -50,6 +50,15 @@ if (has_credential(CRED_PKGBASE_FLAG)): ?>
    • + +

    + This seems to be a VCS package. Please do not + flag it out-of-date if the package version in the AUR does not + match the most recent commit. Flagging this package should only + be done if the sources moved or changes in the PKGBUILD are + required because of recent upstream changes. +

    +

    ', ''); ?> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 1df21a2..a492589 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -367,6 +367,27 @@ function pkgbase_get_pkgnames($base_id) { return $result->fetchAll(PDO::FETCH_COLUMN, 0); } +/** + * Determine whether a package base is (or contains a) VCS package + * + * @param int $base_id The ID of the package base + * + * @return bool True if the package base is/contains a VCS package + */ +function pkgbase_is_vcs($base_id) { + $suffixes = array("-cvs", "-svn", "-git", "-hg", "-bzr", "-darcs"); + $haystack = pkgbase_get_pkgnames($base_id); + array_push($haystack, pkgbase_name_from_id($base_id)); + foreach ($haystack as $pkgname) { + foreach ($suffixes as $suffix) { + if (substr_compare($pkgname, $suffix, -strlen($suffix)) === 0) { + return true; + } + } + } + return false; +} + /** * Delete all packages belonging to a package base *