- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCHv2 1/4] zsh completion: add querying packages for database
by Daniel Wallace 09 Mar '13

09 Mar '13

Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- contrib/zsh_completion.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index ab658c1..cae12ae 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -79,6 +79,7 @@ _pacman_opts_remove=( _pacman_opts_database=( '--asdeps[mark packages as non-explicitly installed]' '--asexplicit[mark packages as explicitly installed]' + '*:installed package:_pacman_completions_installed_packages' ) # options for passing to _arguments: options for --sync command -- 1.8.1.5

3 6

[pacman-dev] [PATCH] zsh completion: include description for clean
by Daniel Wallace 09 Mar '13

09 Mar '13

needs a description in the main case statement. Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- I forgot to add this to the last patch of the last ones. contrib/zsh_completion.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index fa63203..48bbb39 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -366,8 +366,8 @@ _pacman_zsh_comp() { _pacman_action_database ;; S*c*) # no completion - _arguments -s \ - '(-c --clean)'{\*-c,\*--clean} \ + _arguments -s : \ + '(-c --clean)'{\*-c,\*--clean}'[Remove all files from the cache]' \ "$_pacman_opts_common[@]" ;; S*l*) # repos -- 1.8.1.5

2 1

[pacman-dev] [PATCH 1/4] zsh completion: add deptest and database
by Daniel Wallace 09 Mar '13

09 Mar '13

Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- contrib/zsh_completion.in | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 84ee93c..a40192c 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -6,9 +6,11 @@ typeset -A opt_args # options for passing to _arguments: main pacman commands _pacman_opts_commands=( + '-D[Modify database]' '-Q[Query the package database]' '-R[Remove a package from the system]' '-S[Synchronize packages]' + '-T[Check if dependencies are installed]' '-U[Upgrade a package]' '-V[Display version and exit]' '-h[Display usage]' @@ -71,6 +73,11 @@ _pacman_opts_remove=( '*:installed package:_pacman_completions_installed_packages' ) +_pacman_opts_database=( + '--asdeps[mark packages as non-explicitly installed]' + '--asexplicit[mark packages as explicitly installed]' +) + # options for passing to _arguments: options for --sync command _pacman_opts_sync_actions=( '*-c[Remove old packages from cache]:*:clean:->sync_clean' @@ -164,6 +171,16 @@ _pacman_action_remove() { "$_pacman_opts_remove[@]" } +# handles --database subcommand +_pacman_action_database() { + _arguments -s : \ + '-D' \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_database[@]" +} + + + # handles --sync subcommand _pacman_action_sync() { local context state line @@ -309,6 +326,13 @@ _pacman_zsh_comp() { -Q*) _pacman_action_query ;; -R*) _pacman_action_remove ;; -S*c*) # no completion + -T*) + _arguments -s : \ + '-T' \ + "$_pacman_opts_common[@]" \ + ":packages:_pacman_all_packages" + ;; + -D*) _pacman_action_database ;; return 0 ;; -S*l*) # repos -- 1.8.1.5

3 7

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

08 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

2 2

[pacman-dev] [PATCH] bash_completion: update for color
by Allan McRae 08 Mar '13

08 Mar '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I guess this is what is needed... anyone more familiar with bash completion want to confirm? contrib/bash_completion.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index b0901af..6ab264d 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -46,7 +46,7 @@ _pacman_key() { _get_comp_words_by_ref cur prev opts=('add delete export finger help list-keys recv-keys updatedb verify version config edit-key gpgdir import import-trustdb init keyserver - list-sigs lsign-key populate refresh-keys' + list-sigs lsign-key populate refresh-keys nocolor' 'a d e f h l r u v V') # operations for which we want to complete keyids @@ -105,7 +105,7 @@ _pacman() { info list needed nodeps print refresh recursive search sysupgrade' 'c g i l p s u w y') upgrade=('asdeps asexplicit force needed nodeps print recursive' 'p') - common=('arch cachedir config dbpath debug help logfile noconfirm + common=('arch cachedir color config dbpath debug help logfile noconfirm noprogressbar noscriptlet quiet root verbose' 'b d h q r v') core=('database help query remove sync upgrade version' 'D Q R S U V h') @@ -116,7 +116,7 @@ _pacman() { if [[ $? != 0 ]]; then _arch_ptr2comp core elif [[ ! $prev =~ ^-\w*[Vbhr] && - ! $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]] + ! $prev = --@(cachedir|color|config|dbpath|help|logfile|root|version) ]] then [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common || case ${o% *} in -- 1.8.1.5

1 0

[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