From patchwork Tue Aug 4 14:09:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Jakubiak X-Patchwork-Id: 1743 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 096E91A561861 for ; Tue, 4 Aug 2020 14:11:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_ADSP_CUSTOM_MED=0.001, DKIM_INVALID=1,DKIM_SIGNED=0.1,FREEMAIL_FROM=0.5,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001,T_DMARC_POLICY_NONE=0.01, T_DMARC_SIMPLE_DKIM=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [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 ; Tue, 4 Aug 2020 14:11:16 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id D18EA1D36721DE; Tue, 4 Aug 2020 14:11:15 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WegiUFfr Authentication-Results: orion.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WegiUFfr DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uwytnzVf1D26jMtzt0ocR47mwjiMTLyjURIS28ZANyE=; b=WegiUFfrITIEvof19LtQb3NgFmnBzJFZxUCo59LlzitPHUYX/rJsx3wZc1BgRoZNJq 0vwgAKrPaRnuw6OOIE+deKIH/Qi1t2jhBBl/ySeelNlV1fuIfpoI8oQ4SJCWpq92+dPJ OGWJOKilQhn0zuvVy9MCR50onKQ8eDeotqlWbYLC0hfRKnFvMlDOLuxZilAajOOsJWtw 3aOnJj0JeZ8BgjErp7AAvb6VYgLIRyr6LrzNw4ranmr2q7WzadfB20EWqV0fUbQVhYEV 7EzfmkcxgCUpdKTDcywKc3cKRFgsU44JMha1VLV4N0g6VIasAyL8yHeVN1E/xmDe9jwD jDjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uwytnzVf1D26jMtzt0ocR47mwjiMTLyjURIS28ZANyE=; b=UQqgD3r0sUKvyc04Bq1xapUASmY4yfCXW1UNrQmQEnK94dEvPXv+6ev23YBK/j3Q5o d3qaPbDFM9MwDHxtMgLADHaU1X5jvvEjeHfNgVgpXE1vNY7kKJZsBnHlsRi2vjk3lC9N wljc0I0Pz3LYn/r9qfgwaXoHZ17ybfvBtUiBOVz1M8AGzyneLcMOJLTdufCfulNoTiXJ RQtLXAN+OBEDy0iNPLkuyVZA/GQx2wrtF3w9COE7TgTnTTg5nfIKU26jiK5pNjW3PAt5 AgJCGTmH1fNx0d/m6vzTrKqfuTJA8qfqC5LljUzFIVRfyrArvc/hWGYMzRnfVXtJhueT u9NQ== X-Gm-Message-State: AOAM533iJY04OdZyu7VYpU1S3wvvxLZktD93ETIdse9zsIUf0qFXHhy3 HAC7bSsS9ka+y0RVQlvhTKvPK/fT X-Google-Smtp-Source: ABdhPJxg6OSu6fQWpoHualhQdPdenR7KQ3Lrej0Ma/DPuuGxmRDEDSH1Z3KtEIEfAOzihrH7+W5hyA== X-Received: by 2002:adf:bbca:: with SMTP id z10mr18963719wrg.425.1596550269751; Tue, 04 Aug 2020 07:11:09 -0700 (PDT) From: Sebastian Jakubiak To: pacman-contrib@lists.archlinux.org Subject: [PATCH] pactree: Fix vertical limbs for --optional Date: Tue, 4 Aug 2020 16:09:48 +0200 Message-Id: <20200804140948.9539-1-jakseb.dev@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" When pactree was run with -o/--optional turned on, limbs were sometimes not properly cut off for the last children of packages that had no optional dependencies. Example: $ pactree -a -d2 -o libluv libluv |-luajit | `-gcc-libs `-libuv | |-glibc | `-libnsl Signed-off-by: Sebastian Jakubiak --- src/pactree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pactree.c b/src/pactree.c index e34ecc8..cf05519 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -540,7 +540,7 @@ static void print_dep_list(alpm_list_t *deps, alpm_list_t *dblist, alpm_pkg_t *p }; depth->next = &d; /* last dep, cut off the limb here */ - if((last && optional && opt_dep) || (last && !optional)) { + if(last) { if(depth->prev) { depth->prev->next = &d; d.prev = depth->prev;