- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] make status/log messages reflect version change
by Simon Gomizelj 07 Mar '13

07 Mar '13

Currently pacman either prints 'adding' or 'upgrading' when installing a package. This make pacman print and log the other possible actions: 'downgrade' and 'reinstall' --- lib/libalpm/add.c | 61 +++++++++++++++++++++++---------------------------- lib/libalpm/alpm.h | 20 +++++++++++++++++ src/pacman/callback.c | 30 +++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 33 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f70e2cb..1d9db60 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -464,10 +464,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { int i, ret = 0, errors = 0; - int is_upgrade; + int is_upgrade = 0; alpm_pkg_t *oldpkg = NULL; alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; + alpm_progress_t event = ALPM_PROGRESS_ADD_START; + alpm_event_t done = ALPM_EVENT_ADD_DONE, start = ALPM_EVENT_ADD_START; + const char *log_msg = "adding"; const char *pkgfile; ASSERT(trans != NULL, return -1); @@ -475,6 +478,23 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* see if this is an upgrade. if so, remove the old package first */ alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); if(local) { + int cmp = _alpm_pkg_compare_versions(newpkg, local); + if(cmp < 0) { + log_msg = "downgrading"; + event = ALPM_PROGRESS_DOWNGRADE_START; + start = ALPM_EVENT_DOWNGRADE_START; + done = ALPM_EVENT_DOWNGRADE_DONE; + } else if(cmp == 0) { + log_msg = "reinstalling"; + event = ALPM_PROGRESS_REINSTALL_START; + start = ALPM_EVENT_REINSTALL_START; + done = ALPM_EVENT_REINSTALL_DONE; + } else { + log_msg = "upgrading"; + event = ALPM_PROGRESS_UPGRADE_START; + start = ALPM_EVENT_UPGRADE_START; + done = ALPM_EVENT_UPGRADE_DONE; + } is_upgrade = 1; /* we'll need to save some record for backup checks later */ @@ -485,17 +505,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); - - EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); - } else { - is_upgrade = 0; - EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL); } + EVENT(handle, start, newpkg, local); + pkgfile = newpkg->origin_data.file; _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", - is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version); + log_msg, newpkg->name, newpkg->version); /* pre_install/pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { @@ -564,13 +581,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } /* call PROGRESS once with 0 percent, as we sort-of skip that here */ - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, 0, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, 0, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, 0, pkg_count, pkg_current); for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) { int percent; @@ -588,13 +599,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, percent = 0; } - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, percent, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, percent, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, percent, pkg_count, pkg_current); /* extract the next file from the archive */ errors += extract_single_file(handle, archive, entry, newpkg, oldpkg); @@ -651,13 +656,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, newpkg->name); } - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, 100, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, 100, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, 100, pkg_count, pkg_current); /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) @@ -670,11 +669,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, free(scriptlet); } - if(is_upgrade) { - EVENT(handle, ALPM_EVENT_UPGRADE_DONE, newpkg, oldpkg); - } else { - EVENT(handle, ALPM_EVENT_ADD_DONE, newpkg, oldpkg); - } + EVENT(handle, done, newpkg, oldpkg); cleanup: _alpm_pkg_free(oldpkg); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index afa5cd7..ccbdd1c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -321,6 +321,24 @@ typedef enum _alpm_event_t { * to the callback, respectively. */ ALPM_EVENT_UPGRADE_DONE, + /** Package will be downgraded. + * A pointer to the downgraded package is passed to the callback. + */ + ALPM_EVENT_DOWNGRADE_START, + /** Package was downgraded. + * A pointer to the new package, and a pointer to the old package is passed + * to the callback, respectively. + */ + ALPM_EVENT_DOWNGRADE_DONE, + /** Package will be reinstalled. + * A pointer to the reinstalled package is passed to the callback. + */ + ALPM_EVENT_REINSTALL_START, + /** Package was reinstalled. + * A pointer to the new package, and a pointer to the old package is passed + * to the callback, respectively. + */ + ALPM_EVENT_REINSTALL_DONE, /** Target package's integrity will be checked. */ ALPM_EVENT_INTEGRITY_START, /** Target package's integrity was checked. */ @@ -400,6 +418,8 @@ typedef void (*alpm_cb_question)(alpm_question_t, void *, void *, void *, int *) typedef enum _alpm_progress_t { ALPM_PROGRESS_ADD_START, ALPM_PROGRESS_UPGRADE_START, + ALPM_PROGRESS_DOWNGRADE_START, + ALPM_PROGRESS_REINSTALL_START, ALPM_PROGRESS_REMOVE_START, ALPM_PROGRESS_CONFLICTS_START, ALPM_PROGRESS_DISKSPACE_START, diff --git a/src/pacman/callback.c b/src/pacman/callback.c index edd5b39..152bbf1 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -207,6 +207,30 @@ void cb_event(alpm_event_t event, void *data1, void *data2) alpm_pkg_get_version(data1)); display_new_optdepends(data2, data1); break; + case ALPM_EVENT_DOWNGRADE_START: + if(config->noprogressbar) { + printf(_("downgrading %s...\n"), alpm_pkg_get_name(data1)); + } + break; + case ALPM_EVENT_DOWNGRADE_DONE: + alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, + "downgraded %s (%s -> %s)\n", + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data2), + alpm_pkg_get_version(data1)); + display_new_optdepends(data2, data1); + break; + case ALPM_EVENT_REINSTALL_START: + if(config->noprogressbar) { + printf(_("reinstalling %s...\n"), alpm_pkg_get_name(data1)); + } + break; + case ALPM_EVENT_REINSTALL_DONE: + alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, + "reinstalled %s (%s)\n", + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1)); + break; case ALPM_EVENT_INTEGRITY_START: if(config->noprogressbar) { printf(_("checking package integrity...\n")); @@ -444,6 +468,12 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, case ALPM_PROGRESS_UPGRADE_START: opr = _("upgrading"); break; + case ALPM_PROGRESS_DOWNGRADE_START: + opr = _("downgrading"); + break; + case ALPM_PROGRESS_REINSTALL_START: + opr = _("reinstalling"); + break; case ALPM_PROGRESS_REMOVE_START: opr = _("removing"); break; -- 1.8.1.5

1 0

[pacman-dev] [PATCH] remove the duplicate strnlen and strndup
by Simon Gomizelj 07 Mar '13

07 Mar '13

Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/util.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 3270c74..cc0e548 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1635,26 +1635,4 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list return ret; } -#ifndef HAVE_STRNDUP -/* A quick and dirty implementation derived from glibc */ -static size_t strnlen(const char *s, size_t max) -{ - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); -} - -char *strndup(const char *s, size_t n) -{ - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); - - if(new == NULL) - return NULL; - - new[len] = '\0'; - return (char *)memcpy(new, s, len); -} -#endif - /* vim: set ts=2 sw=2 noet: */ -- 1.8.1.5

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-611-ge292b1b
by allan＠archlinux.org 07 Mar '13

07 Mar '13

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 "The official pacman repository". The branch, master has been updated via e292b1b5a24e8e106f1c38c7e99e494f841d9346 (commit) via 32f3b4304c6be397bc34cea82b6bf358c4f13f89 (commit) via 7dd1a5a58d463ef6ec8f64d932119d15bda838e0 (commit) via 326345b378c05bc3ebca11899b2635b12cb72467 (commit) via 46c10c5bf32d00a30a452be4a966983e1a0905da (commit) via ce06e6f9b9529c204224468537354cd4013c8f39 (commit) via 5dada13a1a5d8cc6edccf74f80d7e445467cd5f5 (commit) via e8130b8f2cf540bb0ad12afc552b2774a0ca5a83 (commit) via 6582f68c9d8c36806b2450540cf2dea87c930177 (commit) via c8c7a5137473770eb4b2d9d54495c2a39b32cbe3 (commit) via ea42d03ea153a17edc792844c572f0d3d0803bd6 (commit) via ce5ee8a065a590564982191c76cb325ab05e04e2 (commit) via b4459f1e04b5666add1ad0f38a155e798bac130a (commit) via ef5feb15a7403c6b7ea258927bb04c9111653669 (commit) via 098cfe516d0a406ace95b12eeb5a2fecaff27a8b (commit) from 8b03b1a8776043978aeac31682f94d65b4f3e514 (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 e292b1b5a24e8e106f1c38c7e99e494f841d9346 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 16:18:49 2013 -0500 update documentation and config files Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 32f3b4304c6be397bc34cea82b6bf358c4f13f89 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 15:48:17 2013 -0500 colourize -Q Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7dd1a5a58d463ef6ec8f64d932119d15bda838e0 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 15:33:46 2013 -0500 colourize -Sl/-Ql Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 326345b378c05bc3ebca11899b2635b12cb72467 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Wed Mar 6 12:08:07 2013 -0500 colourize -Ss/-Qs Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46c10c5bf32d00a30a452be4a966983e1a0905da Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 15:18:28 2013 -0500 colourize the output of -Qi/Si Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce06e6f9b9529c204224468537354cd4013c8f39 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 15:00:40 2013 -0500 colourize table output Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5dada13a1a5d8cc6edccf74f80d7e445467cd5f5 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 14:56:18 2013 -0500 colourize warnings and errors Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8130b8f2cf540bb0ad12afc552b2774a0ca5a83 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Wed Mar 6 11:53:04 2013 -0500 colourize colon_printf and question Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6582f68c9d8c36806b2450540cf2dea87c930177 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 14:52:16 2013 -0500 introduce colstr for colourizing colstr_t colstr will hold the colourizing agents. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c8c7a5137473770eb4b2d9d54495c2a39b32cbe3 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 14:27:40 2013 -0500 add a config settings and flag for colours Colours can be enabled in two ways: - Add Color to pacman.conf. This enables colours automatically. - Use --color=WHEN where WHEN is none/auto/always. WHEN as 'never' disables colours (overrides config file), as 'auto' enables colours when stdout is a tty, and 'always' enables colours no matter what. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ea42d03ea153a17edc792844c572f0d3d0803bd6 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 13:52:14 2013 -0500 standardize format functions Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce5ee8a065a590564982191c76cb325ab05e04e2 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Feb 28 18:52:34 2013 -0500 remove format from statistic messages Remove the format component of the "Total Download Size" and related messages. The heading will be colourized, the size won't. However since the length of these messages can vary by language, we need a pretty printer to format them nicely. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b4459f1e04b5666add1ad0f38a155e798bac130a Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Feb 28 18:49:45 2013 -0500 split "Packages (%zd):" message Basically all translation messages that need colouring but _also_ happen to be format strings need to be split up. This makes it easy to conditionally embed colour codes into the output at runtime. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ef5feb15a7403c6b7ea258927bb04c9111653669 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Mar 1 13:40:02 2013 -0500 remove :: prefix from all message This will substantially simplify the logic to add colours to messages. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 098cfe516d0a406ace95b12eeb5a2fecaff27a8b Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Feb 28 13:56:28 2013 -0500 refactor common code in query_search/sync_search Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 5 +++ doc/pacman.conf.5.txt | 3 ++ etc/pacman.conf.in | 1 + src/pacman/callback.c | 26 ++++++------ src/pacman/conf.c | 52 +++++++++++++++++++++++ src/pacman/conf.h | 25 +++++++++++- src/pacman/package.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++---- src/pacman/package.h | 3 ++ src/pacman/pacman.c | 16 ++++++++ src/pacman/query.c | 60 ++------------------------- src/pacman/remove.c | 2 +- src/pacman/sync.c | 95 +++++++----------------------------------- src/pacman/util.c | 109 +++++++++++++++++++++++++++++++++++++------------ src/pacman/util.h | 5 ++- 14 files changed, 324 insertions(+), 189 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-596-g8b03b1a
by allan＠archlinux.org 07 Mar '13

07 Mar '13

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 "The official pacman repository". The branch, master has been updated via 8b03b1a8776043978aeac31682f94d65b4f3e514 (commit) via 6831a5f4b1bd05031fc4033d0d7f3328723dfd73 (commit) via a03f5f55cd46cc69f01a04be2114056decc9beb6 (commit) via 017184fab55b22c1efd8a7d6d6d832ca302d8e15 (commit) via 1b39653e9624db98c2e707a1991bc32bb26f2b67 (commit) via a98bb96b434d788d1599e622c33dce851113fabd (commit) via e6b8d5189f50c36b972a6c57d74a3127bca4ce2d (commit) from 8e2648bf02b44a7dc82429327c08cbfd2426ac30 (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 8b03b1a8776043978aeac31682f94d65b4f3e514 Author: Neer Sighted <neersighted(a)myopera.com> Date: Fri Mar 1 09:41:33 2013 -0800 makepkg: Use a recursive git clone. Make makepkg use a recursive clone when creating the working directory. This will initialize submodules Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6831a5f4b1bd05031fc4033d0d7f3328723dfd73 Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Tue Mar 5 02:03:44 2013 +0100 makepkg: Avoid find to fork for each rm call Reported-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a03f5f55cd46cc69f01a04be2114056decc9beb6 Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Tue Mar 5 02:03:43 2013 +0100 Add staticlibs option in PKGBUILD This option helps to removes static library files in packages. Related to the thread: https://mailman.archlinux.org/pipermail/arch-dev-public/2013-March/024552.h… Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 017184fab55b22c1efd8a7d6d6d832ca302d8e15 Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Mon Mar 4 09:48:10 2013 +0100 libalpm: Search for replacers before literals Since 882bff36 literals would be searched before replacers, resulting in a package being replaced by another not actually being replaced under certain conditions (e.g. they're both in the same repo). This change effectively reversed the expectations in test sync132. This patch switches the order back to replacers first, thus making sure if a package is replacing another one, the change will always happen, even if both are in the same repo. Note that a package replacing another one in a repo with higher priority will not be done, see FS#11737 and test sync1105 Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1b39653e9624db98c2e707a1991bc32bb26f2b67 Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Sun Mar 3 22:46:19 2013 +0100 libalpm: Fix installing update of a replaced package During a sysupgrade, if a package is replaced by another, and an update for the former package is found (on another repo) the replaced package would be re-installed. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a98bb96b434d788d1599e622c33dce851113fabd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 2 23:49:40 2013 -0500 fix typos in pacman tests Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e6b8d5189f50c36b972a6c57d74a3127bca4ce2d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 2 08:19:03 2013 +1000 Do not resolve every local package filelist on remove Although technically correct, this results in my system taking ~30 seconds to resolve all filelists when removing a package that has a directory not owned by any package. The check for if any package own the empty directory is a rare enough occurance, and it will be even rarer when that directory has a directory symlink in its path, so just revert this at this stage. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 21 +++++++++++---------- lib/libalpm/remove.c | 4 +++- lib/libalpm/sync.c | 28 ++++++++++++++++------------ scripts/makepkg.sh.in | 15 ++++++++++----- test/pacman/tests/fileconflict006.py | 4 ++-- test/pacman/tests/fileconflict016.py | 2 +- test/pacman/tests/replace102.py | 2 -- test/pacman/tests/symlink002.py | 2 +- test/pacman/tests/sync1104.py | 18 ++++++++++++++++++ test/pacman/tests/sync1105.py | 17 +++++++++++++++++ test/pacman/tests/sync132.py | 4 ++-- 13 files changed, 90 insertions(+), 37 deletions(-) create mode 100644 test/pacman/tests/sync1104.py create mode 100644 test/pacman/tests/sync1105.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 00/15] Colour support in pacman V2!
by Simon Gomizelj 07 Mar '13

07 Mar '13

I believe I've addressed all the current concerns with the patchset. Submitting again for further review. https://github.com/vodik/pacman/ https://github.com/vodik/pacman/compare/cb2edc60cf...master Simon Gomizelj (15): refactor common code in query_search/sync_search remove :: prefix from all message split "Packages (%zd):" message remove format from statistic messages standardize format functions add a config settings and flag for colours introduce colstr for colourizing colourize colon_printf and question colourize warnings and errors colourize table output colourize the output if -Qi/Si colourize -Ss/-Qs colourize -Sl/-Ql colourize -Q update documentation and config files doc/pacman.8.txt | 5 +++ doc/pacman.conf.5.txt | 3 ++ etc/pacman.conf.in | 1 + src/pacman/callback.c | 26 ++++++------ src/pacman/conf.c | 52 ++++++++++++++++++++++++ src/pacman/conf.h | 25 +++++++++++- src/pacman/package.c | 107 ++++++++++++++++++++++++++++++++++++++++++++----- src/pacman/package.h | 3 ++ src/pacman/pacman.c | 16 ++++++++ src/pacman/query.c | 60 ++-------------------------- src/pacman/remove.c | 2 +- src/pacman/sync.c | 95 +++++++------------------------------------- src/pacman/util.c | 108 ++++++++++++++++++++++++++++++++++++++------------ src/pacman/util.h | 5 ++- 14 files changed, 320 insertions(+), 188 deletions(-) -- 1.8.1.5

2 19

[pacman-dev] Cleaning up pretty printing in pacman.
by Simon Gomizelj 06 Mar '13

06 Mar '13

While diving into pacman's output code to try and add colours I've noticed that pacman's pretty printing code is somewhat awkward. Its very clear its grow organically without ever really being cleaned up. - Translation messages shouldn't have formatting information embedded into them: _("Name"), not _("Name :") _("Version"), not _("Version :") etc - Pacman puts a lot of effort into making some parts of its output is nicely aligned, while other parts don't and expects padding to be hardcoded. Pacman should do _all_ the aligning. An example of where pacman's pretty printing code is specifically inefficient... dump_pkg_full: cols = getcols(fileno(stdout)); string_display(_("Name :"), alpm_pkg_get_name(pkg), cols); string_display(_("Version :"), alpm_pkg_get_version(pkg), cols); string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); string_display(_("URL :"), alpm_pkg_get_url(pkg), cols); list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg), cols); list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg), cols); deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg), cols); - cols is recalculated for each package. - string_display,list_display,etc call string_length on $1 each time. These two numbers could basically be considered constants though through the outputting. So this means when I do `pacman -Si` (output for ~6080 packages here): - cols is recalculated ~6080 times too much. - string_display about (6080 * 20) or 121600 times. dump_pkg_full is basically outputting a table. There is no reason pacman couldn't pre-calculate the dimensions of the table to significantly reduce the amount of work it does when printing each row. Furthermore, there seems to be, with my colour patches, two more independent table implementations: table_display and add_table_row/display_transaction_sizes. They all build the same kind of table and format them in similar ways. I think the right way forward is to add a nice table formatter library to pacman that can be reused for everything. I whipped up a very quick prototype as a proof of concept: http://ix.io/4CP/ I wanted to bring this up so that a) its on the record and b) we can start talking about if/how to implement this. I'm willing to put in the effort to get this through.

2 1

[pacman-dev] Colour support in pacman!
by Simon Gomizelj 06 Mar '13

06 Mar '13

Colourize pacman output! This patchset duplicates about 95% of the colour support pacman-color provides. I don't duplicate everything and I vary slightly in how I colour certain messages to avoid massively restructuring pacman. Its a good starting point which can be improved on. Work on improving this means improving a lot of pacman's pretty printing code. Anyhow... Colours can be enabled in two ways: - Add 'Color' to pacman.conf. This enables automatic colouring. - Use --color=WHEN where WHEN is none/auto/always. WHEN as 'never' disables colours (overrides config file), as 'auto' enables colours when stdout is a tty, and 'always' enables colours no matter what. None disables colours (overrides config file), auto enables colours when stdout is a tty, and always enables colours no matter what. I do not read pacman-color's color.conf. Probably never will. - We can't configure makepkg's colours - The config file has _very_ strange semantics (eg Red = intensive red) doc/pacman.8.txt | 3 ++ doc/pacman.conf.5.txt | 3 ++ etc/pacman.conf.in | 1 + src/pacman/callback.c | 26 +++++++------- src/pacman/conf.c | 52 +++++++++++++++++++++++++++ src/pacman/conf.h | 22 +++++++++++- src/pacman/package.c | 91 ++++++++++++++++++++++++++++++++++++++++++----- src/pacman/package.h | 3 ++ src/pacman/pacman.c | 15 ++++++++ src/pacman/query.c | 59 ++----------------------------- src/pacman/remove.c | 2 +- src/pacman/sync.c | 95 ++++++++----------------------------------------- src/pacman/util.c | 98 ++++++++++++++++++++++++++++++++++++++------------- src/pacman/util.h | 5 +-- 14 files changed, 289 insertions(+), 186 deletions(-)

5 38

[pacman-dev] [PATCH 11/14] colorize the output if -Qi/Si
by Allan McRae 06 Mar '13

06 Mar '13

From: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- For review... src/pacman/conf.c | 28 ++++++++++++++++++---------- src/pacman/conf.h | 4 ++++ src/pacman/package.c | 27 +++++++++++++++++---------- src/pacman/util.c | 8 ++++---- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f488234..7ab8ec6 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -62,11 +62,15 @@ config_t *config = NULL; void enable_colors(int colors) { if(colors == PM_COLOR_ON) { - config->colstr.colon = BOLDBLUE "::" BOLDWHITE " "; - config->colstr.title = BOLDWHITE; - config->colstr.warn = BOLDYELLOW; - config->colstr.err = BOLDRED; - config->colstr.nc = NC; + config->colstr.colon = BOLDBLUE "::" BOLDWHITE " "; + config->colstr.title = BOLDWHITE; + config->colstr.repo = BOLDMAGENTA; + config->colstr.version = BOLDGREEN; + config->colstr.groups = BOLDBLUE; + config->colstr.meta = BOLDCYAN; + config->colstr.warn = BOLDYELLOW; + config->colstr.err = BOLDRED; + config->colstr.nc = NC; } } @@ -91,11 +95,15 @@ config_t *config_new(void) newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } - newconfig->colstr.colon = ":: "; - newconfig->colstr.title = ""; - newconfig->colstr.warn = "", - newconfig->colstr.err = "", - newconfig->colstr.nc = ""; + newconfig->colstr.colon = ":: "; + newconfig->colstr.title = ""; + newconfig->colstr.repo = ""; + newconfig->colstr.version = ""; + newconfig->colstr.groups = ""; + newconfig->colstr.meta = ""; + newconfig->colstr.warn = ""; + newconfig->colstr.err = ""; + newconfig->colstr.nc = ""; return newconfig; } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 18bfb02..d2702ed 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -25,6 +25,10 @@ typedef struct __colstr_t { const char *colon; const char *title; + const char *repo; + const char *version; + const char *groups; + const char *meta; const char *warn; const char *err; const char *nc; diff --git a/src/pacman/package.c b/src/pacman/package.c index 7deb3db..2abf39e 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -167,13 +167,16 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) size = humanize_size(alpm_pkg_get_size(pkg), 'K', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { - printf(_("Download Size : %6.2f %s\n"), size, label); + printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size :"), + config->colstr.nc, size, label); } else if(from == ALPM_PKG_FROM_FILE) { - printf(_("Compressed Size: %6.2f %s\n"), size, label); + printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Compressed Size:"), + config->colstr.nc, size, label); } size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 2, &label); - printf(_("Installed Size : %6.2f %s\n"), size, label); + printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"), + config->colstr.nc, size, label); string_display(_("Packager :"), alpm_pkg_get_packager(pkg), cols); string_display(_("Build Date :"), bdatestr, cols); @@ -267,7 +270,8 @@ void dump_pkg_backups(alpm_pkg_t *pkg) { alpm_list_t *i; const char *root = alpm_option_get_root(config->handle); - printf(_("Backup Files:\n")); + printf("%s%s%s", config->colstr.title, _("Backup Files:\n"), + config->colstr.nc); if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { @@ -348,10 +352,11 @@ void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg) alpm_pkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname); if(lpkg) { const char *lpkgver = alpm_pkg_get_version(lpkg); + const colstr_t *colstr = &config->colstr; if(strcmp(lpkgver, pkgver) == 0) { - printf(" [%s]", _("installed")); + printf(" %s[%s]%s", colstr->meta, _("installed"), colstr->nc); } else { - printf(" [%s: %s]", _("installed"), lpkgver); + printf(" %s[%s: %s]%s", colstr->meta, _("installed"), lpkgver, colstr->nc); } } } @@ -362,6 +367,7 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in int freelist = 0; alpm_list_t *i, *searchlist; unsigned short cols; + const colstr_t *colstr = &config->colstr; /* if we have a targets list, search for packages matching it */ if(targets) { @@ -383,12 +389,13 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in if(config->quiet) { fputs(alpm_pkg_get_name(pkg), stdout); } else { - printf("%s/%s %s", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(db), + colstr->title, alpm_pkg_get_name(pkg), + colstr->version, alpm_pkg_get_version(pkg), colstr->nc); if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - fputs(" (", stdout); + printf(" %s(", colstr->groups); for(k = grp; k; k = alpm_list_next(k)) { const char *group = k->data; fputs(group, stdout); @@ -397,7 +404,7 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in putchar(' '); } } - putchar(')'); + printf(")%s", colstr->nc); } if(installed_in) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 0b1b7b7..b0f4918 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -427,7 +427,7 @@ static size_t string_length(const char *s) void string_display(const char *title, const char *string, unsigned short cols) { if(title) { - printf("%s ", title); + printf("%s%s%s ", config->colstr.title, title, config->colstr.nc); } if(string == NULL || string[0] == '\0') { printf(_("None")); @@ -620,7 +620,7 @@ void list_display(const char *title, const alpm_list_t *list, if(title) { len = string_length(title) + 1; - printf("%s ", title); + printf("%s%s%s ", config->colstr.title, title, config->colstr.nc); } if(!list) { @@ -660,7 +660,7 @@ void list_display_linebreak(const char *title, const alpm_list_t *list, if(title) { len = (unsigned short)string_length(title) + 1; - printf("%s ", title); + printf("%s%s%s ", config->colstr.title, title, config->colstr.nc); } if(!list) { @@ -1502,7 +1502,7 @@ static int question(short preset, const char *format, va_list args) fprintf(stream, " %s ", _("[y/N]")); } - fputs(colstr.nc, stream); + fputs(config->colstr.nc, stream); fflush(stream); if(config->noconfirm) { -- 1.8.1.5

1 1

[pacman-dev] [PATCH 08/14] colourize warnings and errors
by Allan McRae 06 Mar '13

06 Mar '13

From: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- Resending for review... src/pacman/conf.c | 12 +++++++----- src/pacman/conf.h | 2 ++ src/pacman/util.c | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index baaf6a1..f488234 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -61,12 +61,12 @@ config_t *config = NULL; void enable_colors(int colors) { - colstr_t *colstr = &config->colstr; - if(colors == PM_COLOR_ON) { - colstr->colon = BOLDBLUE "::" BOLDWHITE " "; - colstr->title = BOLDWHITE; - colstr->nc = NC; + config->colstr.colon = BOLDBLUE "::" BOLDWHITE " "; + config->colstr.title = BOLDWHITE; + config->colstr.warn = BOLDYELLOW; + config->colstr.err = BOLDRED; + config->colstr.nc = NC; } } @@ -93,6 +93,8 @@ config_t *config_new(void) newconfig->colstr.colon = ":: "; newconfig->colstr.title = ""; + newconfig->colstr.warn = "", + newconfig->colstr.err = "", newconfig->colstr.nc = ""; return newconfig; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index aab1832..18bfb02 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -25,6 +25,8 @@ typedef struct __colstr_t { const char *colon; const char *title; + const char *warn; + const char *err; const char *nc; } colstr_t; diff --git a/src/pacman/util.c b/src/pacman/util.c index d0e70ea..dcb0406 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1661,10 +1661,12 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list /* print a prefix to the message */ switch(level) { case ALPM_LOG_ERROR: - fprintf(stream, _("error: ")); + fprintf(stream, "%s%s%s", config->colstr.err, _("error: "), + config->colstr.nc); break; case ALPM_LOG_WARNING: - fprintf(stream, _("warning: ")); + fprintf(stream, "%s%s%s", config->colstr.warn, _("warning: "), + config->colstr.nc); break; case ALPM_LOG_DEBUG: fprintf(stream, "debug: "); -- 1.8.1.5

1 1

[pacman-dev] [PATCH 07/14] introduce colstr for colourizing
by Allan McRae 06 Mar '13

06 Mar '13

From: Simon Gomizelj <simongmzlj(a)gmail.com> colstr_t colstr will hold the colourizing agents. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- Sending for easy review... src/pacman/conf.c | 36 ++++++++++++++++++++++++++++++++++++ src/pacman/conf.h | 10 ++++++++++ src/pacman/pacman.c | 1 + src/pacman/util.c | 6 ++++-- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index dca6e3e..baaf6a1 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -39,6 +39,37 @@ /* global config variable */ config_t *config = NULL; +#define NC "\033[0m" + +#define BLACK "\033[0;30m" +#define RED "\033[0;31m" +#define GREEN "\033[0;32m" +#define YELLOW "\033[0;33m" +#define BLUE "\033[0;34m" +#define MAGENTA "\033[0;35m" +#define CYAN "\033[0;36m" +#define WHITE "\033[0;37m" + +#define BOLDBLACK "\033[1;30m" +#define BOLDRED "\033[1;31m" +#define BOLDGREEN "\033[1;32m" +#define BOLDYELLOW "\033[1;33m" +#define BOLDBLUE "\033[1;34m" +#define BOLDMAGENTA "\033[1;35m" +#define BOLDCYAN "\033[1;36m" +#define BOLDWHITE "\033[1;37m" + +void enable_colors(int colors) +{ + colstr_t *colstr = &config->colstr; + + if(colors == PM_COLOR_ON) { + colstr->colon = BOLDBLUE "::" BOLDWHITE " "; + colstr->title = BOLDWHITE; + colstr->nc = NC; + } +} + config_t *config_new(void) { config_t *newconfig = calloc(1, sizeof(config_t)); @@ -60,6 +91,10 @@ config_t *config_new(void) newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } + newconfig->colstr.colon = ":: "; + newconfig->colstr.title = ""; + newconfig->colstr.nc = ""; + return newconfig; } @@ -439,6 +474,7 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "Color") == 0) { if(config->color == PM_COLOR_UNSET) { config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; + enable_colors(config->color); } } else { pm_printf(ALPM_LOG_WARNING, diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 6cabd33..aab1832 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -22,6 +22,12 @@ #include <alpm.h> +typedef struct __colstr_t { + const char *colon; + const char *title; + const char *nc; +} colstr_t; + typedef struct __config_t { unsigned short op; unsigned short quiet; @@ -98,6 +104,9 @@ typedef struct __config_t { alpm_list_t *explicit_adds; alpm_list_t *explicit_removes; + + /* Color strings for output */ + colstr_t colstr; } config_t; /* Operations */ @@ -156,6 +165,7 @@ enum { /* global config variable */ extern config_t *config; +void enable_colors(int colors); config_t *config_new(void); int config_free(config_t *oldconfig); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index aabdba0..6d624d2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -407,6 +407,7 @@ static int parsearg_global(int opt) optarg); return 1; } + enable_colors(config->color); break; case OP_CONFIG: check_optarg(); diff --git a/src/pacman/util.c b/src/pacman/util.c index 3027789..d0e70ea 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1491,7 +1491,7 @@ static int question(short preset, const char *format, va_list args) fflush(stdout); fflush(stderr); - fprintf(stream, ":: "); + fputs(config->colstr.colon, stream); vfprintf(stream, format, args); if(preset) { @@ -1558,11 +1558,13 @@ int colon_printf(const char *fmt, ...) int ret; va_list args; - fputs(":: ", stdout); va_start(args, fmt); + fputs(config->colstr.colon, stdout); ret = vprintf(fmt, args); + fputs(config->colstr.nc, stdout); va_end(args); + fflush(stdout); return ret; } -- 1.8.1.5

1 1