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 4ZtgJM17HBz33LG for ; Thu, 8 May 2025 18:14:27 +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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZtgJH4bsQz2xVX for ; Thu, 8 May 2025 18:14:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4ZtgJH0CDqz110; Thu, 8 May 2025 18:14:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746728063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Paw3jMcELYtMNvvAW06JN5KAsUb7idbNNNzG+fpLhN4=; b=gov+l4JNQ4ZK9xll5NTGOIPBt0nn1+0bKKiL50DYf8aza5bRjFzyq0mHx8knnHZtzt1Cip bowgGS2Rl9H0pIBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746728063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Paw3jMcELYtMNvvAW06JN5KAsUb7idbNNNzG+fpLhN4=; b=XbuxShzIM1iypR2aq1CTxpBe0aQpmT/Yry5/JfLfft+M633pzX9IVhvXEQJmd11KzmT1H3 mRJfWh3IsLRx2bKHF00x7F+O6BmMj5AtH8cZUNqpdO8z7SdmPi/czpoGaEn4/C8/PSf5A3 l2JKbvV0hVCiuvLIjc7RaunmXtF576Z96TeYIvCd5ugQgBaCqPU0T/rpbWel+ejekqNsGw PGg+EGytqrjnPp7KhATAhoKUzS9iEiRun5RMUavtCmI+iVosQGKgei0pdqoQFnU211MAiN hRcKPlDTZMJ0PTc3C1F47/jUwXeTSYm+GdWI6/7cA43YVk42LDZTA18JFKLXIg== Content-Type: text/plain; charset=utf-8 Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: Mime-Version: 1.0 Subject: Re: [PATCH] functions.pl: Fix Bug13842 - Add resolvedeps to pakfire Usage:. From: Michael Tremer In-Reply-To: <3538ddfc-6119-428c-8ab9-86f75303b0a0@firemypi.org> Date: Thu, 8 May 2025 19:14:22 +0100 Cc: "IPFire: Development-List" Content-Transfer-Encoding: quoted-printable Message-Id: <521981BD-CB14-4C8B-9172-788D65699C66@ipfire.org> References: <20250423023903.144393-1-stephen@firemypi.org> <96b287c8-3639-4638-94c0-5f7e4cf33d6a@firemypi.org> <3538ddfc-6119-428c-8ab9-86f75303b0a0@firemypi.org> To: stephen@firemypi.org Hello, The v2 is just a follow-up really and the tag is being added by = appending =E2=80=9C-v2=E2=80=9D to the =E2=80=9Cgit send-email=E2=80=9D = command line. You can submit it as usual against next because I should already have = applied the previous change. This is now really a fix to a broken patch, but rather another = improvement that follows an earlier one. Hope this helped :) -Michael > On 8 May 2025, at 18:47, stephen@firemypi.org wrote: >=20 > Hello Michael, >=20 > I have never done a v2 patch. I've seen them with [PATCHv2] in the = heading. I suspect that I would need to do something different with = 'git format-patch' but not sure what. Or is it as simple as editing the = file created with 'git format-patch'? >=20 > Regards, > Stephen >=20 > On 5/8/25 11:20, Michael Tremer wrote: >> Hello Stephen, >>=20 >> Yes, I am very happy with this change. It makes it very clear. >>=20 >> Regarding the patch, what guidance do you need? >>=20 >> -Michael >>=20 >>> On 8 May 2025, at 17:49, stephen@firemypi.org wrote: >>>=20 >>> Hello, >>>=20 >>> I did some work on the Usage: text for pakfire to clean it up. = Thanks Jon for your input. The revision is below. >>>=20 >>> 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. >>>=20 >>> Regards, >>> Stephen >>>=20 >>> [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 >>>=20 >>> [root@zone3 ~]# >>>=20 >>>=20 >>>=20 >>>=20 >>> On 4/24/25 16:46, Jon Murphy wrote: >>>> Sorry for the late suggestion! >>>>=20 >>>> I cleaned up the pakfire help a little. It removes some of the = leading spaces. >>>>=20 >>>>=20 >>>> ``` >>>> [root@ipfire ~] # pakfire >>>>=20 >>>> Usage: >>>> pakfire [option] =E2=80=A6 >>>>=20 >>>> pakfire provides a safe and easy way to install add-ons and = updates. >>>>=20 >>>> 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 >>>>=20 >>>> Options: >>>> -y | --non-interactive - enables the non-interactive = mode >>>> --no-colors - turns off colors >>>> ``` >>>>=20 >>>> Feel free to use or feel free to ignore this. It is a suggestion. >>>>=20 >>>> Jon >>>>=20 >>>>=20 >>>> ------ Original Message ------ >>>> =46rom "Stephen Cuka" >>>> To development@lists.ipfire.org >>>> Cc "Stephen Cuka" >>>> Date 4/22/2025 9:39:03=E2=80=AFPM >>>> Subject [PATCH] functions.pl: Fix Bug13842 - Add resolvedeps to = pakfire Usage:. >>>>=20 >>>>> - Add 'resolvedeps' command to pakfire 'Usage:'. >>>>>=20 >>>>> - Break long lines in 'Usage:' so that they don't wrap. >>>>>=20 >>>>> - Minor text and punctuation changes. >>>>>=20 >>>>> Signed-off-by: Stephen Cuka >>>>> --- >>>>> src/pakfire/lib/functions.pl | 12 ++++++++---- >>>>> 1 file changed, 8 insertions(+), 4 deletions(-) >>>>>=20 >>>>> 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 { >>>>>=20 >>>>> 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."); >>>>> --=20 >>>>> 2.43.0 >>>>>=20 >>>>>=20