From patchwork Mon Jun 1 00:00:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 22488 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F1C6F27BBE3; Mon, 1 Jun 2020 01:01:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9369927BBE1 for ; Mon, 1 Jun 2020 01:01:24 +0100 (BST) Received: from localhost ([::1]:37812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfXtM-000334-5i for patchwork@mira.cbaines.net; Sun, 31 May 2020 20:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfXt1-0002kR-BM for guix-patches@gnu.org; Sun, 31 May 2020 20:01:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfXt1-0005zy-0K for guix-patches@gnu.org; Sun, 31 May 2020 20:01:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfXt0-0003ag-Tr for guix-patches@gnu.org; Sun, 31 May 2020 20:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39258] [PATCH 4/4] ui: Use package-description-string. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jun 2020 00:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 39258@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 39258-submit@debbugs.gnu.org id=B39258.159096964113739 (code B ref 39258); Mon, 01 Jun 2020 00:01:02 +0000 Received: (at 39258) by debbugs.gnu.org; 1 Jun 2020 00:00:41 +0000 Received: from localhost ([127.0.0.1]:34104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfXse-0003ZR-O4 for submit@debbugs.gnu.org; Sun, 31 May 2020 20:00:40 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfXsa-0003Yj-HC for 39258@debbugs.gnu.org; Sun, 31 May 2020 20:00:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=NTHVfTd+ffFR2Zw8V8SaT5CvLkoPUwm2ZBFts1vBTuk=; b=l/yaCqC1EcyvTiCsQi1MRpgYlw wVj+BVNQwc83y8u8Iuo7e499BvKE/y48zU00MIxAlHgeVulO33+kKrM8YCfHqirACS9ygDHSNdgzY hogQ4XnJtfAOaBLh77YKwtMPc8dUQmeRCKQid1xi7nUfLCMyX859VvCQmZtvKC3RNPt0=; Received: from [192.168.2.1] (helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jfXsX-000Zk2-Fl; Mon, 01 Jun 2020 05:30:33 +0530 From: Arun Isaac Date: Mon, 1 Jun 2020 05:30:30 +0530 Message-Id: <20200601000030.7443-5-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601000030.7443-1-arunisaac@systemreboot.net> References: <20200601000030.7443-1-arunisaac@systemreboot.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/ui.scm (package->recutils): Use package-description-string instead of package-description and P_. --- guix/ui.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 744758d1f3..caa506a645 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1468,10 +1468,8 @@ HYPERLINKS? is true, emit hyperlink escape sequences when appropriate." (string->recutils (string-trim-right (parameterize ((%text-width width*)) - (texi->plain-text - (string-append "description: " - (or (and=> (package-description p) P_) - "")))) + (string-append "description: " + (or (package-description-string p) ""))) #\newline))) (for-each (match-lambda ((field . value)