From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZtdRG3mmVz32MJ for ; Thu, 8 May 2025 16:50:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZtdRC0QnZz2xVX for ; Thu, 8 May 2025 16:50:15 +0000 (UTC) Received: from resdmta-a2p-658371.sys.comcast.net (resdmta-a2p-658371.sys.comcast.net [IPv6:2001:558:fd01:2bb4::d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZtdR433lXz2Fy for ; Thu, 8 May 2025 16:50:08 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=comcastmailservice.net header.s=20211018a header.b=HCBEUEx7; spf=none (mail01.ipfire.org: domain of stephen@firemypi.org has no SPF policy when checking 2001:558:fd01:2bb4::d) smtp.mailfrom=stephen@firemypi.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1746723010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oFGmtFNOEO3dBAHS8wzs6q2hMs+3R4ouLanQdKahRfg=; b=n/iAW/XjDcOTthMEbM6S5MXfB5fEYltrI9EbujP/EZtki2RxWauDQuUWOkmtmH3abc8UvH ySvFW9gQq0lcK7XsnaG6QTSCAifby0+A/9pYd/qendES+kqeUKoDNB8wGfopdbrC8L2s25 GWaRKbm7wfz+HhVEMKdflDmpvZHCajDp1FFvztYS2R2ykUD43Iv0s+gRXwoHbrrfV0kdv7 DKlwvaOqhTJ698l68T6SdY/XyH7RVSI7sd2OXR15zozQKiHvmRFtKkssNL5BsBQvScvlJR ykJ3w2KphL1+FU9dfmD4JxuuCdvTO7Kh8eN03mJi7j39e8FiyPR1uRzvHZoVtw== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1746723010; a=rsa-sha256; cv=none; b=H8WXUE/Ow9qNkbGkGw0DmEqtgqKG+ACk6aKaOH+bS3ZEnzXcNV52bzi53DGcfHiA5JH2NO HKWYEX8vqAchniet6iO0pTmgxPsw8Q8Cjx3yqE3s0V88nyrlO5YhEqurk5SCShBEnVFzaJ 5IcYu4id/pYlom80W2Kkpe4iFjgKKVbN3Ng4FvoShz5jWLVuD0gdEppEDulLWKhCUU9flA HhaIda8aDNhIa+mDqcy3MC84wwPjyticMb5IS9DiSsonZMLp2xVJaFEwAnwbsriaUbOQ2P sOSPxKYWNEk75s7G7iLAs0uIURvKrZ8d6jemjVIQyyqaBK9L7Iv/lbLlWq7tqg== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=comcastmailservice.net header.s=20211018a header.b=HCBEUEx7; spf=none (mail01.ipfire.org: domain of stephen@firemypi.org has no SPF policy when checking 2001:558:fd01:2bb4::d) smtp.mailfrom=stephen@firemypi.org; dmarc=none Received: from resomta-a2p-646964.sys.comcast.net ([96.103.145.236]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resdmta-a2p-658371.sys.comcast.net with ESMTPS id D0f6uieIEYBgQD4RauL8do; Thu, 08 May 2025 16:49:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcastmailservice.net; s=20211018a; t=1746722998; bh=oFGmtFNOEO3dBAHS8wzs6q2hMs+3R4ouLanQdKahRfg=; h=Received:Received:Message-ID:Date:MIME-Version:Subject:To:From: Content-Type:Xfinity-Spam-Result; b=HCBEUEx7kT1kS2eGpiAjxpciOJdPUDRaV4EW+JVohwoUPJzL+Y9rzslasaUXRAZwS zcUUt6+jKFMO+EnqAA3OgLhOpxPAgyz38xSATKhUXvTG7srb5X469nmh7s/yrCGN4b HVRn9JauQnClTOaRbT8IMywTwSGGPY1Cc+8MgLwriTWvQw0Tlt7VwIIDO5cY+DJCmd 2tuosA+pLoRIAl//6c6OLdiT9zv3+v9KC75JCAo7IMXw1MYJEoJm0DT+o83eeX3l3O 1NmTjAiXfJz8wL6kKabdYIY+jsChXRKrygOOELZQFH6I4FVU3UuCS2KKBZEAmcahPK nU08tEOzDlTlA== Received: from [192.168.3.30] ([75.70.122.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resomta-a2p-646964.sys.comcast.net with ESMTPSA id D4RYuGJJQHOCyD4RZulLzC; Thu, 08 May 2025 16:49:58 +0000 Message-ID: <96b287c8-3639-4638-94c0-5f7e4cf33d6a@firemypi.org> Date: Thu, 8 May 2025 10:49:36 -0600 Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] functions.pl: Fix Bug13842 - Add resolvedeps to pakfire Usage:. To: "IPFire: Development-List" References: <20250423023903.144393-1-stephen@firemypi.org> Content-Language: en-US From: stephen@firemypi.org In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfHQ0hpRvUYlZCiU7pTOKKfIix2frRKIrHnjwXtC7QocHP+hrQrLSe5usLBrd6T7leHaJXpqvnloZk23OxGdJBWrLCgPAiyUiEzPTRS2+BYFkC7ShA864 E6tNmcF5OAW2VRefuPKE+8J8HsYd7XpXaHEtOsdsZTTd8oGqzZ2X+NVcVgHJtyL/INXr9v8X22RX5i/XHjB/GNSRt8KgAdjV/Qc= X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4ZtdR433lXz2Fy X-Spamd-Result: default: False [0.62 / 11.00]; HFILTER_HELO_5(3.00)[resdmta-a2p-658371.sys.comcast.net]; NEURAL_HAM(-1.00)[-1.000]; BAYES_HAM(-0.85)[85.39%]; IP_REPUTATION_HAM(-0.22)[asn: 7922(-0.21), country: US(-0.01), ip: 2001:558:fd01:2bb4::(0.00)]; R_DKIM_ALLOW(-0.20)[comcastmailservice.net:s=20211018a]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_ALL(0.00)[]; DMARC_NA(0.00)[firemypi.org]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[comcastmailservice.net:+]; RECEIVED_SPAMHAUS_PBL(0.00)[75.70.122.243:received]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_REPUTATION(0.00)[0]; FROM_NO_DN(0.00)[]; ASN(0.00)[asn:7922, ipnet:2001:558::/29, country:US]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1] X-Rspamd-Action: no action Hello, I did some work on the Usage: text for pakfire to clean it up. Thanks Jon for your input.  The revision is below. Should I submit this as a new patch or as one that overrides the previous bugfix patch?  If it's preferable to do an overriding patch, I don't know how to do that so would need some guidance there. Regards, Stephen [root@zone3 ~]# pakfire Usage: pakfire COMMAND [OPTIONS] PACKAGE ... Manage IPFire add-on packages and updates. PACKAGE:   One or more add-on package names. COMMAND:   install      - install one or more packages   remove       - remove one or more packages   update       - update the pakfire database   upgrade      - install latest version of all packages   list [installed | notinstalled | upgrade]                - display a list of installed, notinstalled,                  upgradeable or all packages   info         - display metadata for one or more packages   resolvedeps  - display dependencies for one or more packages   status       - display pakfire database status,                  available updates and whether a reboot                  is required to complete any upgrades OPTIONS:   --no-colors             - turn off colors   -y | --non-interactive  - automatic yes to prompts   -f | --force            - for the update command, force                             a pakfire database update [root@zone3 ~]# On 4/24/25 16:46, Jon Murphy wrote: > Sorry for the late suggestion! > > I cleaned up the pakfire help a little.  It removes some of the > leading spaces. > > > ``` > [root@ipfire ~] # pakfire > > Usage: >     pakfire [option] … > >     pakfire provides a safe and easy way to install add-ons and updates. > > Commands: >     install [option] ...  - install one or more packages >     remove  [option] ...  - uninstall one or more packages >     update                          - download new databases of packages >     upgrade                         - install latest version of all > packages >     list [ --no-colors | installed | notinstalled | upgrade ] >                                     - provides a list with all, > installed, >                                       available, or upgradeable packages >     info ...              - provides package metadata for > one or >                                       more packages >     resolvedeps ...       - provides a list of dependencies for >                                       one or more packages >     status                          - summary of available core upgrades, >                                       updates, and a required reboot > > Options: >     -y | --non-interactive          - enables the non-interactive mode >     --no-colors                     - turns off colors > ``` > > Feel free to use or feel free to ignore this.  It is a suggestion. > > Jon > > > ------ Original Message ------ > From "Stephen Cuka" > To development@lists.ipfire.org > Cc "Stephen Cuka" > Date 4/22/2025 9:39:03 PM > Subject [PATCH] functions.pl: Fix Bug13842 - Add resolvedeps to > pakfire Usage:. > >>  - Add 'resolvedeps' command to pakfire 'Usage:'. >> >>  - Break long lines in 'Usage:' so that they don't wrap. >> >>  - Minor text and punctuation changes. >> >> Signed-off-by: Stephen Cuka >> --- >>  src/pakfire/lib/functions.pl | 12 ++++++++---- >>  1 file changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl >> index e623e8bc3..17b04ad52 100644 >> --- a/src/pakfire/lib/functions.pl >> +++ b/src/pakfire/lib/functions.pl >> @@ -112,11 +112,15 @@ sub logger { >> >>  sub usage { >>    &Pakfire::message("Usage: pakfire [options] >> "); >> -  &Pakfire::message("               - Contacts the servers >> for new lists of paks."); >> -  &Pakfire::message("               - Installs the latest >> version of all paks."); >> -  &Pakfire::message("               >> [installed/notinstalled/upgrade] - Outputs a list with all, >> installed, available or upgradeable paks."); >> +  &Pakfire::message("               - Contact the servers >> for new lists of paks."); >> +  &Pakfire::message("               - Install the latest >> version of all paks."); >> +  &Pakfire::message("               >> [installed|notinstalled|upgrade] - Output a list"); >> +  &Pakfire::message("                 of all, installed, available >> or upgradeable paks."); >>    &Pakfire::message("               [ ...] - >> Output pak metadata."); >> -  &Pakfire::message("               - Outputs a summary >> about available core upgrades, updates and a required reboot"); >> +  &Pakfire::message("               [ ...] >> - Resolve and output pak"); >> +  &Pakfire::message("                 dependencies."); >> +  &Pakfire::message("               - Output a summary of >> available core upgrades,"); >> +  &Pakfire::message("                 updates and a required reboot."); >>    &Pakfire::message(""); >>    &Pakfire::message("       Global options:"); >>    &Pakfire::message("               --non-interactive --> Enables >> the non-interactive mode."); >> -- >> 2.43.0 >> >>