Hello Michael,
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'?
Regards,
Stephen
On 5/8/25 11:20, Michael Tremer wrote:
Hello Stephen,
Yes, I am very happy with this change. It makes it very clear.
Regarding the patch, what guidance do you need?
-Michael
On 8 May 2025, at 17:49, step...@firemypi.org wrote:
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 <command> [option] <packages>…
pakfire provides a safe and easy way to install add-ons and updates.
Commands:
install [option] <packages>... - install one or more packages
remove [option] <packages>... - 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 <packages>... - provides package metadata for one or
more packages
resolvedeps <packages>... - 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" <step...@firemypi.org>
To development@lists.ipfire.org
Cc "Stephen Cuka" <step...@firemypi.org>
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 <step...@firemypi.org>
---
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 <install|remove> [options] <pak(s)>");
- &Pakfire::message(" <update> - Contacts the servers for new lists
of paks.");
- &Pakfire::message(" <upgrade> - Installs the latest version of all
paks.");
- &Pakfire::message(" <list> [installed/notinstalled/upgrade] -
Outputs a list with all, installed, available or upgradeable paks.");
+ &Pakfire::message(" <update> - Contact the servers for new lists of
paks.");
+ &Pakfire::message(" <upgrade> - Install the latest version of all
paks.");
+ &Pakfire::message(" <list> [installed|notinstalled|upgrade] -
Output a list");
+ &Pakfire::message(" of all, installed, available or upgradeable
paks.");
&Pakfire::message(" <info> <pak> [<pak> ...] - Output pak
metadata.");
- &Pakfire::message(" <status> - Outputs a summary about available
core upgrades, updates and a required reboot");
+ &Pakfire::message(" <resolvedeps> <pak> [<pak> ...] - Resolve and
output pak");
+ &Pakfire::message(" dependencies.");
+ &Pakfire::message(" <status> - 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
