Skip to content

Print install and remove messages below transaction summary #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Duncaen merged 11 commits into from
Jan 23, 2025
Merged

Print install and remove messages below transaction summary #572

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b874f2c
Expose xbps_cb_message in libxbps
Chocimier Sep 16, 2023
ee0bf13
lib: display install-msgs before transaction
Chocimier Jul 24, 2021
e39ae4b
lib: skip install-msg seen previously
Chocimier Sep 16, 2023
4478378
xbps-install, -remove: change formatting of install-msgs
Chocimier Jul 24, 2021
89c32af
lib: don't display package messages during transaction
Chocimier Jul 31, 2021
2a0d57f
bin/xbps-{install,remove}: cleanup transaction code function arguments
Duncaen Sep 17, 2023
e2600c2
lib: remove xbps_cb_message and message states
Duncaen Sep 17, 2023
8352e08
bin/xbps-remove: remove message callbacks
Duncaen Sep 17, 2023
52960e8
bin/xbps-install: remove message callbacks
Duncaen Sep 17, 2023
1ac5698
bin/xbps-{install,remove}: print install/remove messages
Duncaen Sep 17, 2023
efa8973
tests: add tests for install and remove messages
Duncaen Sep 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Expose xbps_cb_message in libxbps
  • Loading branch information
@Chocimier
Chocimier committed Sep 16, 2023
commit b874f2cdbf6e7aacd69568b898653238bbf45d5a
10 changes: 10 additions & 0 deletions include/xbps.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,16 @@ int xbps_array_foreach_cb_multi(struct xbps_handle *xhp,
int (*fn)(struct xbps_handle *, xbps_object_t obj, const char *, void *arg, bool *done),
void *arg);

/**
* Prints package message.
*
* @param[in] xhp Pointer to the xbps_handle struct.
* @param[in] pkgd Package dictionary as stored in the transaction dictionary.
* @param[in] key Key of possibly existing message in \a pkgd: "install-msg" or "remove-msg".
* @return 0 for message printed, ENOENT otherwise
*/
int xbps_cb_message(struct xbps_handle *xhp, xbps_dictionary_t pkgd, const char *key);

/**
* Match a virtual package name or pattern by looking at proplib array
* of strings.
Expand Down
1 change: 0 additions & 1 deletion include/xbps_api_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ bool HIDDEN xbps_remove_pkg_from_array_by_pattern(xbps_array_t, const char *);
bool HIDDEN xbps_remove_pkg_from_array_by_pkgver(xbps_array_t, const char *);
void HIDDEN xbps_fetch_set_cache_connection(int, int);
void HIDDEN xbps_fetch_unset_cache_connection(void);
int HIDDEN xbps_cb_message(struct xbps_handle *, xbps_dictionary_t, const char *);
int HIDDEN xbps_entry_is_a_conf_file(xbps_dictionary_t, const char *);
int HIDDEN xbps_entry_install_conf_file(struct xbps_handle *, xbps_dictionary_t,
xbps_dictionary_t, struct archive_entry *, const char *,
Expand Down
2 changes: 1 addition & 1 deletion lib/package_msg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "xbps_api_impl.h"

int HIDDEN
int
xbps_cb_message(struct xbps_handle *xhp, xbps_dictionary_t pkgd, const char *key)
{
xbps_data_t msg;
Expand Down