March 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libalpm/sync: remove useless intermediate variable
by Dave Reisner 08 Mar '13

08 Mar '13

This also rearranges some code to ensure that declarations and code aren't mixed. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/sync.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 147a837..f9217bd 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -212,9 +212,8 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) /* Search for replacers then literal (if no replacer) in each sync database. */ for(j = handle->dbs_sync; j; j = j->next) { alpm_db_t *sdb = j->data; + alpm_list_t *replacers = check_replacers(handle, lpkg, sdb); /* Check sdb */ - alpm_list_t *replacers; - replacers = check_replacers(handle, lpkg, sdb); if(replacers) { trans->add = alpm_list_join(trans->add, replacers); /* jump to next local package */ @@ -222,9 +221,7 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) } else { alpm_pkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); if(spkg) { - int literal_upgrade = 0; - literal_upgrade = check_literal(handle, lpkg, spkg, enable_downgrade); - if(literal_upgrade) { + if(check_literal(handle, lpkg, spkg, enable_downgrade)) { trans->add = alpm_list_add(trans->add, spkg); } /* jump to next local package */ -- 1.8.1.5

2 1

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

08 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 d90641a894b915f5e13876bba88aa765c9961b0a (commit) via 6e0c47d22f44693d6c1fb1c54d5b5beb637d5ebf (commit) via f8ed8620d03e7e6fc58815bbee5b65c786fbc423 (commit) via 5a67eee78c58475907a2128c46c08c137d41e4f9 (commit) via 79d60f0f42a1df4f65ef1b1a930a6107000570fe (commit) via 81f945e2a5cee7995bb8521da5bad0ae91eb4aec (commit) via 9d99914a1893566ffdfcb53ecb894aba3737988e (commit) via 2c91b991eee2c16278111f922ba974857e1ae9cd (commit) via 65650f2cdb04629810cb7545e35ad8af9e25b072 (commit) from e292b1b5a24e8e106f1c38c7e99e494f841d9346 (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 d90641a894b915f5e13876bba88aa765c9961b0a Author: William Giokas <1007380(a)gmail.com> Date: Tue Mar 5 17:05:08 2013 -0600 contrib: Add color to paccache Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6e0c47d22f44693d6c1fb1c54d5b5beb637d5ebf Author: William Giokas <1007380(a)gmail.com> Date: Tue Mar 5 17:01:53 2013 -0600 contrib: Add color to bacman Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f8ed8620d03e7e6fc58815bbee5b65c786fbc423 Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 4 02:42:34 2013 -0600 contrib: Make pacdiff colors the same as makepkg Added an `ask` message function that emulates pacman's appearance. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5a67eee78c58475907a2128c46c08c137d41e4f9 Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 4 02:33:42 2013 -0600 scripts: Add color to repo-add Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 79d60f0f42a1df4f65ef1b1a930a6107000570fe Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 4 02:29:50 2013 -0600 scripts: Add color to pkgdelta Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 81f945e2a5cee7995bb8521da5bad0ae91eb4aec Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 4 02:26:31 2013 -0600 scripts: Add color to pacman-optimize Color enabled by default, use --nocolor to disable colored output. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9d99914a1893566ffdfcb53ecb894aba3737988e Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 4 02:23:31 2013 -0600 scripts: Add color to pacman-key Use --nocolor to suppress colored output from pacman-key, otherwise output will be in color. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2c91b991eee2c16278111f922ba974857e1ae9cd Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 4 02:19:33 2013 -0600 scripts: Add color to pacman-db-upgrade Color enabled by default, use --nocolor to turn off colors. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 65650f2cdb04629810cb7545e35ad8af9e25b072 Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 4 02:08:42 2013 -0600 scripts: Add color to library/output_format.sh Use the same colors as makepkg in messages. Add in the 'plain' function as well. To use the colors, you need to include the term_colors.sh file, or add definitions for the colors explicitly. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.sh.in | 62 ++++++++++++++++++++++------------------ contrib/paccache.sh.in | 20 ++++++------- contrib/pacdiff.sh.in | 35 ++++++----------------- doc/pacman-key.8.txt | 3 ++ doc/repo-add.8.txt | 3 ++ scripts/library/README | 9 ++++-- scripts/library/output_format.sh | 21 ++++++++++---- scripts/library/term_colors.sh | 21 ++++++++++++++ scripts/pacman-db-upgrade.sh.in | 11 ++++++- scripts/pacman-key.sh.in | 5 +++- scripts/pacman-optimize.sh.in | 11 ++++++- scripts/pkgdelta.sh.in | 8 +++++- scripts/repo-add.sh.in | 5 ++++ 13 files changed, 137 insertions(+), 77 deletions(-) create mode 100644 scripts/library/term_colors.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add short options for mark as deps or explicit
by Sébastien Luttringer 07 Mar '13

07 Mar '13

The main (only) purpose of -D is to be able to change packages installation status (deps or explicit). Having a short form offer a similar experience that other main pacman option (e.g. Su). Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- src/pacman/pacman.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 38b28e1..bd33c2d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -165,8 +165,8 @@ static void usage(int op, const char * const myname) } else if(op == PM_OP_DATABASE) { printf("%s: %s {-D --database} <%s> <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); - addlist(_(" --asdeps mark packages as non-explicitly installed\n")); - addlist(_(" --asexplicit mark packages as explicitly installed\n")); + addlist(_(" -d --asdeps mark packages as non-explicitly installed\n")); + addlist(_(" -e --asexplicit mark packages as explicitly installed\n")); } else if(op == PM_OP_DEPTEST) { printf("%s: %s {-T --deptest} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -446,7 +446,9 @@ static int parsearg_global(int opt) static int parsearg_database(int opt) { switch(opt) { + case 'd': case OP_ASDEPS: config->flags |= ALPM_TRANS_FLAG_ALLDEPS; break; + case 'e': case OP_ASEXPLICIT: config->flags |= ALPM_TRANS_FLAG_ALLEXPLICIT; break; default: return 1; } -- 1.8.1.5

7 11

[pacman-dev] [PATCH] zsh completiong: add --color to completion Signed-off-by: Daniel Wallace <danielwallace@gtmanfred.com>
by Daniel Wallace 07 Mar '13

07 Mar '13

--- contrib/zsh_completion.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 84ee93c..69fedf7 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -17,6 +17,7 @@ _pacman_opts_commands=( # options for passing to _arguments: options common to all commands _pacman_opts_common=( '-b[Alternate database location]:database_location:_files -/' + '--color[colorize the output]:color options:(always never auto)' '-h[Display syntax for the given operation]' '-r[Set alternate installation root]:installation root:_files -/' '-v[Be more verbose]' -- 1.8.1.5

1 0

[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' Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- 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] 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