Message ID | 20180512102818.20600-2-lfleischer@archlinux.org |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <aur-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 6EB2540078A2 for <patchwork@archlinux.org>; Sat, 12 May 2018 10:28:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) 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 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: <dns:187.90.89.91.zen.spamhaus.org> [127.0.0.11, 127.0.0.4] <dns:1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.8.0.6.0.6.1.0.8.f.4.0.1.0.a.2.list.dnswl.org> [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for <patchwork@archlinux.org>; Sat, 12 May 2018 10:28:44 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 13E93A4C1CBCB; Sat, 12 May 2018 10:28:38 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Sat, 12 May 2018 10:28:38 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id F24D82F2E1; Sat, 12 May 2018 10:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1526120913; bh=b0jBEDKOtvaT4ktAQLceFmGtysFNU/LwszhXiO5c2FQ=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=BxdbxzwFesc0ZSWBpQ7T+6lJ/5tP5gSMiuhiPvPKGLXM6r8jhkPwq1JSD+yiBCEHX zoSEuiuXjp3WiCONLAdhRL0cxS7dxNccVfQFGfqkc0X6oPUWaVT1HuHJxjoXSua2qq 682cpMpPSvVrotU+BIk1D+n0ylFRGakvolDJkT8AZGsRQN623LHV/GtD0vkasXrTJt BgykYpWhw8Yc2Lzx1v34Q9wO3oRR6ALWTdCHpAfjuH6MpZgVhMHkvkbbdU+HP5Y6ko OeBpMOu4oD3Tx6RbkKlQ3TpXxdouORMHwO7KKUy6uLP+/Ng5BUEEFl0GFEoMMtP4pK PNO5WFAvFMYOv9kV3a5zyFn8KAhnDaVAfmAItAlHMvDm+CbvEEaffebdnVttOdYugd tW1kqv2Q43RsjMHumUsJd53SfOvtZb9W27ZE6oQMqUZ68HOXSZ9xYMRnffxZBysMNK 5jNWLe3rP7KLXmCvw3iDfAmR7xcqwBXxvlfA03oGgiQJ8Tf8goKS/lP0Ol5Iq0bhNj c/i8lB473C109tD03yJiRqk3TMMJCILOWWTz2x/B+QPMZXSkIWedrL4/0w2IVH9MT2 m2tY3T4wD01kRqz+Ii6et1EzlP4t68+qHQdqvlQRGpTklqHjp/UKaQRpP/qRhwezOF sRmD0jE6nGeqB03U12LP6uig= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D83AE2F2E0 for <aur-dev@lists.archlinux.org>; Sat, 12 May 2018 10:28:31 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for <aur-dev@lists.archlinux.org>; Sat, 12 May 2018 10:28:31 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id BD043A4C1CBC3 for <aur-dev@lists.archlinux.org>; Sat, 12 May 2018 10:28:23 +0000 (UTC) Received: from localhost (HSI-KBW-091-089-090-187.hsi2.kabelbw.de [91.89.90.187]) (using TLSv1.2 with cipher DHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: lfleischer) by orion.archlinux.org (Postfix) with ESMTPSA id 8658EA4C1CBC2 for <aur-dev@archlinux.org>; Sat, 12 May 2018 10:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1526120903; bh=b0jBEDKOtvaT4ktAQLceFmGtysFNU/LwszhXiO5c2FQ=; h=From:To:Subject:Date:In-Reply-To:References; b=D3TSnPE8on1VVkHeQhS+X5RUBrU40XKZrxT2WW2lsh8q5RBenX/1u8xVsfUxOT8gC Gt4k1XVA7mbO78rp5hrMXOEjM6e2dXGLg1Yttf2AMnZbH1WUv2URUMPV+sTooYbBYJ pB0VLnOifvY/DhCPf1ZvlGCyy3c+9CH3Lp5iA8kVCZEATC05nEwyQbCJ6C3FdnTDKt n3fOhfxti76FZTkkjtY3+QhcZFENOcHODc+0P7a+LYi3NN5yOZZdNP/9vOc84tPDW4 9o5kVwRxsusZxqaDw0kb5NnxYR2R+R12NcXLR3ct3IgXE4jUToq6Fsd7+/t/BHulRC JLr2buGN8R2trRPfLGoVNSJq6FK0npM+I3wJvaqkq6RhxEu2A8HL2h4/AO9kn758ih 4dSmdfDDJ8CrkFi8AXNp5mP9/WWWArmCuSzM5amTPpLZAMX49ydLLejF5Q2GPFi0Wi mrS8mZ2xYsTiExIhFwKw/Jgqn32KoKsj7pS0F9Pj/eWxJZ07Oy87UD2f25siusPjSo zsuhLdu91R1MjjeHUvlgJ9dfraBWhWhTYUddTqbDiOdO2FrZSR20hfon9VDvvFJCPG fUnIYBxqBWEGtq0Ynf8CoESjMNq+RMkd7Bfkl3XvH/x2eLkfRpNTiNbhCxmyi41Atx 3iGN9dK6z3pZbLIsbNHhL7J4= From: Lukas Fleischer <lfleischer@archlinux.org> To: aur-dev@archlinux.org Subject: [PATCH 2/2] confparser.inc.php: Add missing dollar Date: Sat, 12 May 2018 12:28:18 +0200 Message-Id: <20180512102818.20600-2-lfleischer@archlinux.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180512102818.20600-1-lfleischer@archlinux.org> References: <20180512102818.20600-1-lfleischer@archlinux.org> X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" <aur-dev.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/aur-dev>, <mailto:aur-dev-request@archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/aur-dev/> List-Post: <mailto:aur-dev@archlinux.org> List-Help: <mailto:aur-dev-request@archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/aur-dev>, <mailto:aur-dev-request@archlinux.org?subject=subscribe> Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" <aur-dev-bounces@archlinux.org> |
Series |
[1/2] confparser.inc.php: Add missing semicolon
|
expand
|
diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index cb51e02..1152e13 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -10,7 +10,7 @@ function config_load() { } $defaults_path = getenv('AUR_CONFIG_DEFAULTS'); if (!$defaults_path) { - $defaults_path = path . ".defaults"; + $defaults_path = $path . ".defaults"; } if (file_exists($defaults_path)) { $default_config = parse_ini_file($defaults_path, true, INI_SCANNER_RAW);
Fixes a regression introduced in 97c5bce (config: allow reading both the defaults file and the modified config, 2018-04-15). Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org> --- web/lib/confparser.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)