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 4ZjDs52m6cz32yr for ; Wed, 23 Apr 2025 09:51:37 +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 4ZjDs52V7Jz2yjv for ; Wed, 23 Apr 2025 09:51:37 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (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-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZjDs41Ck4z8Y for ; Wed, 23 Apr 2025 09:51:36 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1745401896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=kGzqGk4oQ32wgZPSk1MGS14VRj0Z9EWVoU2WOCrFu2Q=; b=iX/fMnEtNTERRabkluAMHuDFSik6x3r6/E7++U92/7lxGzBpYVjR0AK6SpBwsNnPjm9xsz 03rfFMQvKvmrE+BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1745401896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=kGzqGk4oQ32wgZPSk1MGS14VRj0Z9EWVoU2WOCrFu2Q=; b=Z5PFx058kZWOwh3r7RcZqI4c/XeI2hQnptEXCz2AwwQKf89OudevLGgh6t8ImLPaG7ddTh 59BLsFcBYaW/MOiegBULZBS2oRcDdPa/zRa9sI40NRPOHoZRR2MXIriJaLr2buBTVLHAAd S7sdeoXomo1L2/bMga8Uj6MFpdParFrrJWmaAGfj3Yp2T9caeSP6Yq4cf3qK17COXyjcYF axKzFpDmK1hDDQ9TPkPYIjS54PZkTNIBy0WI6UCHPQOTp/X9b6nGScY3/B1gUfMnRp4lc5 tBgwWX2Bkhbskp8OTK8Q1ZzRZkt4oil6nJiMe1OVoPUBTeUiLki0G4LwdLD74w== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ZjDs35kjSz2xq7; Wed, 23 Apr 2025 09:51:35 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f0c8d0eb9a4121b15e28a663bf65d22b8eaed9b0 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 10056cb0676af79f3f41c089f1563217404e7d25 X-Git-Newrev: f0c8d0eb9a4121b15e28a663bf65d22b8eaed9b0 Message-Id: <4ZjDs35kjSz2xq7@people01.haj.ipfire.org> Date: Wed, 23 Apr 2025 09:51:35 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 Date: Wed Apr 23 09:51:07 2025 +0000 core195: Ship functions.pl Signed-off-by: Michael Tremer commit 5c9f9b8fc232e594be3fe8a4420816d7d28b3e21 Author: Stephen Cuka 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 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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 [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."); hooks/post-receive -- IPFire 2.x development tree