[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f0c8d0eb9a4121b15e28a663bf65d22b8eaed9b0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f0c8d0eb9a4121b15e28a663bf65d22b8eaed9b0

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  f0c8d0eb9a4121b15e28a663bf65d22b8eaed9b0 (commit)
       via  5c9f9b8fc232e594be3fe8a4420816d7d28b3e21 (commit)
      from  10056cb0676af79f3f41c089f1563217404e7d25 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f0c8d0eb9a4121b15e28a663bf65d22b8eaed9b0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Apr 23 09:51:07 2025 +0000

    core195: Ship functions.pl
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 5c9f9b8fc232e594be3fe8a4420816d7d28b3e21
Author: Stephen Cuka <stephen@firemypi.org>
Date:   Tue Apr 22 20:39:03 2025 -0600

    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 <stephen@firemypi.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/195/filelists/files |  1 +
 src/pakfire/lib/functions.pl              | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/195/filelists/files b/config/rootfiles/core/195/filelists/files
index 1b22c0917e..ca8972dd2e 100644
--- a/config/rootfiles/core/195/filelists/files
+++ b/config/rootfiles/core/195/filelists/files
@@ -1,3 +1,4 @@
+opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi
 var/ipfire/general-functions.pl
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index e623e8bc3f..17b04ad52a 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.");


hooks/post-receive
--
IPFire 2.x development tree