- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Add msg_printf to factor out the :: from messages
by Simon Gomizelj 04 Jan '13

04 Jan '13

This will make it considerably easier to add colors properly to pacman down the road. --- src/pacman/callback.c | 24 ++++++++++++------------ src/pacman/remove.c | 2 +- src/pacman/sync.c | 14 +++++++------- src/pacman/util.c | 14 ++++++++++++++ src/pacman/util.h | 2 ++ 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..c0bb074 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -232,7 +232,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) fputs((const char *)data1, stdout); break; case ALPM_EVENT_RETRIEVE_START: - printf(_(":: Retrieving packages ...\n")); + msg_printf(_("Retrieving packages ...\n")); break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -266,14 +266,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2, switch(event) { case ALPM_QUESTION_INSTALL_IGNOREPKG: if(!config->op_s_downloadonly) { - *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), + *response = yesno(_("%s is in IgnorePkg/IgnoreGroup. Install anyway?"), alpm_pkg_get_name(data1)); } else { *response = 1; } break; case ALPM_QUESTION_REPLACE_PKG: - *response = yesno(_(":: Replace %s with %s/%s?"), + *response = yesno(_("Replace %s with %s/%s?"), alpm_pkg_get_name(data1), (char *)data3, alpm_pkg_get_name(data2)); @@ -282,12 +282,12 @@ void cb_question(alpm_question_t event, void *data1, void *data2, /* data parameters: target package, local package, conflict (strings) */ /* print conflict only if it contains new information */ if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) { - *response = noyes(_(":: %s and %s are in conflict. Remove %s?"), + *response = noyes(_("%s and %s are in conflict. Remove %s?"), (char *)data1, (char *)data2, (char *)data2); } else { - *response = noyes(_(":: %s and %s are in conflict (%s). Remove %s?"), + *response = noyes(_("%s and %s are in conflict (%s). Remove %s?"), (char *)data1, (char *)data2, (char *)data3, @@ -304,9 +304,9 @@ void cb_question(alpm_question_t event, void *data1, void *data2, (char *)alpm_pkg_get_name(i->data)); count++; } - printf(_n( - ":: The following package cannot be upgraded due to unresolvable dependencies:\n", - ":: The following packages cannot be upgraded due to unresolvable dependencies:\n", + msg_printf(_n( + "The following package cannot be upgraded due to unresolvable dependencies:\n", + "The following packages cannot be upgraded due to unresolvable dependencies:\n", count)); list_display(" ", namelist, getcols(fileno(stdout))); printf("\n"); @@ -322,7 +322,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, alpm_list_t *providers = data1; size_t count = alpm_list_count(providers); char *depstring = alpm_dep_compute_string((alpm_depend_t *)data2); - printf(_(":: There are %zd providers available for %s:\n"), count, + msg_printf(_("There are %zd providers available for %s:\n"), count, depstring); free(depstring); select_display(providers); @@ -331,7 +331,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, break; case ALPM_QUESTION_LOCAL_NEWER: if(!config->op_s_downloadonly) { - *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), + *response = yesno(_("%s-%s: local version is newer. Upgrade anyway?"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); } else { @@ -339,7 +339,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, } break; case ALPM_QUESTION_CORRUPTED_PKG: - *response = yesno(_(":: File %s is corrupted (%s).\n" + *response = yesno(_("File %s is corrupted (%s).\n" "Do you want to delete it?"), (char *)data1, alpm_strerror(*(alpm_errno_t *)data2)); @@ -356,7 +356,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, revoked = " (revoked)"; } - *response = yesno(_(":: Import PGP key %d%c/%s, \"%s\", created: %s%s?"), + *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s%s?"), key->length, key->pubkey_algo, key->fingerprint, key->uid, created, revoked); } break; diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 472adb5..ebe4692 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -119,7 +119,7 @@ int pacman_remove(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; char *depstring = alpm_dep_compute_string(miss->depend); - printf(_(":: %s: requires %s\n"), miss->target, depstring); + msg_printf(_("%s: requires %s\n"), miss->target, depstring); free(depstring); } break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 532a667..34e7330 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -661,7 +661,7 @@ static int process_group(alpm_list_t *dbs, const char *group, int error) } if(config->print == 0) { - printf(_(":: There are %d members in group %s:\n"), count, + msg_printf(_("There are %d members in group %s:\n"), count, group); select_display(pkgs); char *array = malloc(count); @@ -786,7 +786,7 @@ static int sync_trans(alpm_list_t *targets) } if(config->op_s_upgrade) { - printf(_(":: Starting full system upgrade...\n")); + msg_printf(_("Starting full system upgrade...\n")); alpm_logaction(config->handle, "starting full system upgrade\n"); if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) { pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle))); @@ -812,14 +812,14 @@ int sync_prepare_execute(void) case ALPM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { const char *pkg = i->data; - printf(_(":: package %s does not have a valid architecture\n"), pkg); + msg_printf(_("package %s does not have a valid architecture\n"), pkg); } break; case ALPM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; char *depstring = alpm_dep_compute_string(miss->depend); - printf(_(":: %s: requires %s\n"), miss->target, depstring); + msg_printf(_("%s: requires %s\n"), miss->target, depstring); free(depstring); } break; @@ -828,11 +828,11 @@ int sync_prepare_execute(void) alpm_conflict_t *conflict = i->data; /* only print reason if it contains new information */ if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { - printf(_(":: %s and %s are in conflict\n"), + msg_printf(_("%s and %s are in conflict\n"), conflict->package1, conflict->package2); } else { char *reason = alpm_dep_compute_string(conflict->reason); - printf(_(":: %s and %s are in conflict (%s)\n"), + msg_printf(_("%s and %s are in conflict (%s)\n"), conflict->package1, conflict->package2, reason); free(reason); } @@ -953,7 +953,7 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_sync) { /* grab a fresh package list */ - printf(_(":: Synchronizing package databases...\n")); + msg_printf(_("Synchronizing package databases...\n")); alpm_logaction(config->handle, "synchronizing package lists\n"); if(!sync_synctree(config->op_s_sync, sync_dbs)) { return 1; diff --git a/src/pacman/util.c b/src/pacman/util.c index 5ed450e..e980e5d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1491,6 +1491,7 @@ static int question(short preset, char *fmt, va_list args) fflush(stdout); fflush(stderr); + fprintf(stream, ":: "); vfprintf(stream, fmt, args); if(preset) { @@ -1552,6 +1553,19 @@ int noyes(char *fmt, ...) return ret; } +int msg_printf(const char *fmt, ...) +{ + int ret; + va_list args; + + printf(":: "); + va_start(args, fmt); + ret = vprintf(fmt, args); + va_end(args); + + return ret; +} + int pm_printf(alpm_loglevel_t level, const char *format, ...) { int ret; diff --git a/src/pacman/util.h b/src/pacman/util.h index 0dfdc85..644dcc4 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -75,6 +75,8 @@ int multiselect_question(char *array, int count); int yesno(char *fmt, ...); int noyes(char *fmt, ...); +int msg_printf(const char *fmt, ...); + int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -- 1.8.0.1

2 1

[pacman-dev] [PATCH] Make pacman say its downgrading packages
by Simon Gomizelj 04 Jan '13

04 Jan '13

When the package being installed has a lower version than the local one, print that its 'downgrading' instead of 'upgrading' on screen and in the log. Fixes FS#30392 Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- lib/libalpm/add.c | 59 ++++++++++++++++++++++----------------------------- lib/libalpm/alpm.h | 10 +++++++++ src/pacman/callback.c | 15 +++++++++++++ 3 files changed, 50 insertions(+), 34 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index edddc31..357fc0e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -453,10 +453,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 end = ALPM_EVENT_ADD_DONE, start = ALPM_EVENT_ADD_START; + const char *msg = "adding"; const char *pkgfile; ASSERT(trans != NULL, return -1); @@ -464,6 +467,18 @@ 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) { + msg = "downgrading"; + event = ALPM_PROGRESS_DOWNGRADE_START; + start = ALPM_EVENT_DOWNGRADE_START; + end = ALPM_EVENT_DOWNGRADE_DONE; + } else { + msg = "upgrading"; + event = ALPM_PROGRESS_UPGRADE_START; + start = ALPM_EVENT_UPGRADE_START; + end = ALPM_EVENT_UPGRADE_DONE; + } is_upgrade = 1; /* we'll need to save some record for backup checks later */ @@ -474,17 +489,15 @@ 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, NULL); + pkgfile = newpkg->origin_data.file; - _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", - is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version); + _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", msg, + newpkg->name, newpkg->version); + /* pre_install/pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { @@ -552,13 +565,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; @@ -576,13 +583,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); @@ -636,13 +637,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) @@ -655,11 +650,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, end, newpkg, oldpkg); cleanup: _alpm_pkg_free(oldpkg); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1d6a8c6..bc067e0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -311,6 +311,15 @@ 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, /** Target package's integrity will be checked. */ ALPM_EVENT_INTEGRITY_START, /** Target package's integrity was checked. */ @@ -378,6 +387,7 @@ typedef enum _alpm_progress_t { ALPM_PROGRESS_ADD_START, ALPM_PROGRESS_UPGRADE_START, ALPM_PROGRESS_REMOVE_START, + ALPM_PROGRESS_DOWNGRADE_START, ALPM_PROGRESS_CONFLICTS_START, ALPM_PROGRESS_DISKSPACE_START, ALPM_PROGRESS_INTEGRITY_START, diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..5ebe957 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -203,6 +203,18 @@ 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, "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_INTEGRITY_START: if(config->noprogressbar) { printf(_("checking package integrity...\n")); @@ -423,6 +435,9 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, case ALPM_PROGRESS_REMOVE_START: opr = _("removing"); break; + case ALPM_PROGRESS_DOWNGRADE_START: + opr = _("downgrading"); + break; case ALPM_PROGRESS_CONFLICTS_START: opr = _("checking for file conflicts"); break; -- 1.8.0.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-505-g9c160cf
by allan＠archlinux.org 04 Jan '13

04 Jan '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 9c160cf3f3cbda5fe5b6188e9e31775b71fc5bab (commit) via 7a83cd003a064a067a510514b62686c3e972fede (commit) via 49c5f515e91b2978f951634d6118ff58aa64b1de (commit) via 09295f7e40a990971b81c3ebfea474bae873c223 (commit) via 86eefc1a3a3419bb41b2acab521a476db0d2a7ce (commit) via b5709b8171c5be82ebb3651680ae3698b7513f43 (commit) via e13a3bf5990d03cca25c86efbfbaf2540d645413 (commit) via 46e9afdd74b39be78e6d66696d1e53914894e9b7 (commit) via 925d44bde6e7b4966b6c063e1af7cc1db29b2070 (commit) via b6320de4be2e39b01c1c03ebac2ffcdfa7ab7098 (commit) via 27d9c25ee2fd6a03fb1ec1afdfbe105048875bae (commit) from 965e1de2174148a7a6c0860a7514d9bb1969bf03 (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 9c160cf3f3cbda5fe5b6188e9e31775b71fc5bab Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Sep 8 17:14:19 2012 -0400 Allow querying directory ownership The restriction of not checking the ownership of a directory is unnecessary given that all the package filelists contain this information. Remove this restriction, with the expectation that you might get multiple packages returned for a given directory. Additionally attempt to minimise the number of files getting through to the slow realpath call. Original-work-by: Dan McGee <dan(a)archlinux.org> Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7a83cd003a064a067a510514b62686c3e972fede Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Aug 28 21:59:25 2012 -0400 query_fileowner: don't append '/' if path is "/" Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 49c5f515e91b2978f951634d6118ff58aa64b1de Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Mon Jun 18 16:46:26 2012 +0200 pacman-key: reduce verbosity of --populate Do not bother the user with gpg's verbose output. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 09295f7e40a990971b81c3ebfea474bae873c223 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 19 14:55:35 2012 +1000 pacman-key: handle local signing of multiple keys gpg --lsign-key does not like being given multiple keys to sign. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 86eefc1a3a3419bb41b2acab521a476db0d2a7ce Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu Jan 3 18:48:53 2013 -0300 Fix space between control structure and open parens Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b5709b8171c5be82ebb3651680ae3698b7513f43 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu Jan 3 18:48:52 2013 -0300 Fix open braces style Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e13a3bf5990d03cca25c86efbfbaf2540d645413 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu Jan 3 18:48:51 2013 -0300 Fix missing spaces in operators Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46e9afdd74b39be78e6d66696d1e53914894e9b7 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu Jan 3 18:48:50 2013 -0300 fix comment style // -> /* */ Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 925d44bde6e7b4966b6c063e1af7cc1db29b2070 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 4 09:10:40 2013 +1000 Fix spacing in HACKING spacing example Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b6320de4be2e39b01c1c03ebac2ffcdfa7ab7098 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Wed Aug 1 17:34:37 2012 +0200 Save backup files with extension .pacsave.n Teach pacman to save backup files with extension .pacsave.n, where n is a positive integer. The current backup file shall be saved as <name>.pacsave, while existing .pacsave.n files will be renamed to <name>.pacsave.n+1 Example: 1. You have subversion installed in your local repo. /etc/conf.d/svnserve is a file to be backed up. It contains local modifications 2. You remove subversion from your repo. /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave 2. You install subversion again 3. You edit /etc/conf.d/svnserve 4. You remove subversion. The existing /etc/conf.d/svnserve.pacsave is renamed to /etc/conf.d/svnserve.pacsave.1 and /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Rebased from original email and adjusted for util-common usage. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 27d9c25ee2fd6a03fb1ec1afdfbe105048875bae Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 3 20:49:33 2013 +1000 Split common utility functions for libalpm and pacman There is duplicated code in the util.c files in the libalpm and pacman source code. Split this into a separate file so that it can be shared via a symlink. This prevents code divergence between the two code bases. Also, move mbasename and mdirname from pacman/util.c into util-common.c in preparation for the following patch that uses them to add an extension to pacsave files. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 2 +- Makefile.am | 2 +- configure.ac | 1 + lib/libalpm/Makefile.am | 1 + lib/libalpm/be_package.c | 2 +- lib/libalpm/conflict.c | 3 +- lib/libalpm/filelist.c | 4 +- lib/libalpm/handle.c | 7 +- lib/libalpm/remove.c | 76 ++++++++++++++++ lib/libalpm/signing.c | 5 +- lib/libalpm/util-common.c | 1 + lib/libalpm/util-common.h | 1 + lib/libalpm/util.c | 51 ++--------- lib/libalpm/util.h | 5 +- lib/libalpm/version.c | 42 ++++----- scripts/pacman-key.sh.in | 24 +++-- src/common/Makefile.am | 4 + src/common/util-common.c | 109 +++++++++++++++++++++++ lib/libalpm/add.h => src/common/util-common.h | 19 ++-- src/pacman/Makefile.am | 3 +- src/pacman/callback.c | 4 +- src/pacman/check.c | 2 +- src/pacman/conf.c | 14 +-- src/pacman/pacman.c | 3 +- src/pacman/query.c | 66 +++++++++----- src/pacman/sync.c | 6 +- src/pacman/util-common.c | 1 + src/pacman/util-common.h | 1 + src/pacman/util.c | 59 ++---------- src/pacman/util.h | 8 +- src/util/cleanupdelta.c | 11 ++- src/util/pacsort.c | 2 +- src/util/pactree.c | 7 +- test/pacman/tests/{remove011.py => remove012.py} | 9 +- 34 files changed, 356 insertions(+), 199 deletions(-) create mode 120000 lib/libalpm/util-common.c create mode 120000 lib/libalpm/util-common.h create mode 100644 src/common/Makefile.am create mode 100644 src/common/util-common.c copy lib/libalpm/add.h => src/common/util-common.h (75%) create mode 120000 src/pacman/util-common.c create mode 120000 src/pacman/util-common.h copy test/pacman/tests/{remove011.py => remove012.py} (51%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman-key: reduce verbosity of --populate
by Allan McRae 04 Jan '13

04 Jan '13

From: Pierre Schmitz <pierre(a)archlinux.de> Do not bother the user with gpg's verbose output. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- This is a reduced version of the earlier patch sent by Pierre. It removes the 2>/dev/null from the --import-ownertrust line as we never hide "error" output. It would be better to ask upstream gpg to move that to stdout - then we can hide it. Also that output is only ever shown on the install of the keyring package and not in an upgrade (provided the ownertrust does not change...). The --quiet added here only hides the output of the list of keys being imported from the keyring file. Those people who are interested enough to go through that output in detail can still look directly at the keyring file. scripts/pacman-key.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 9561c7f..bd02d01 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -277,7 +277,7 @@ populate_keyring() { # Add keys from requested keyrings for keyring in "${KEYRINGIDS[@]}"; do msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" - "${GPG_PACMAN[@]}" --import "${KEYRING_IMPORT_DIR}/${keyring}.gpg" + "${GPG_PACMAN[@]}" --quiet --import "${KEYRING_IMPORT_DIR}/${keyring}.gpg" done # Read the trusted key IDs to an array. Because this is an ownertrust -- 1.8.1

1 0

[pacman-dev] [PATCH] Fix spacing in HACKING spacing example
by Allan McRae 04 Jan '13

04 Jan '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING b/HACKING index e859bd8..068617f 100644 --- a/HACKING +++ b/HACKING @@ -97,7 +97,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data) NOT foobar[2*size+1]=function(a,6); - for(a = 0; a < n && n > 0; a++,n--) {} + for(a = 0; a < n && n > 0; a++, n--) {} NOT for(a=0;a<n&&n>0;a++,n--) {} -- 1.8.1

1 0

[pacman-dev] [PATCH 1/4] fix comment style // -> /* */
by Gerardo Exequiel Pozzi 03 Jan '13

03 Jan '13

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- src/pacman/check.c | 2 +- src/util/cleanupdelta.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index a657f95..92ce05c 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -310,7 +310,7 @@ int check_pkg_full(alpm_pkg_t *pkg) if(type == AE_IFREG) { /* TODO: these are expected to be changed with backup files */ file_errors += check_file_size(pkgname, filepath, &st, entry); - //file_errors += check_file_md5sum(pkgname, filepath, &st, entry); + /* file_errors += check_file_md5sum(pkgname, filepath, &st, entry); */ } if(config->quiet && file_errors) { diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 2f7720b..eecb1ae 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -42,7 +42,7 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; - //case ALPM_LOG_DEBUG: printf("debug: "); break; + /* case ALPM_LOG_DEBUG: printf("debug: "); break; */ default: return; } vprintf(fmt, args); -- 1.8.1

1 3

[pacman-dev] [PATCH 1/2] Split common utility functions for libalpm and pacman
by Allan McRae 03 Jan '13

03 Jan '13

There is duplicated code in the util.c files in the libalpm and pacman source code. Split this into a separate file so that it can be shared via a symlink. This prevents code divergence between the two code bases. Also, move mbasename and mdirname from pacman/util.c into util-common.c in preparation for the following patch that uses them to add an extension to pacsave files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is revised based on comments from Dan that suggested a separate directory for the common file and symlinks into both the libalpm and pacman directories so that it would be obvious you are editing a common file. Also pulled in the mbasename/mdirname functions in one patch, because if HAVE_STRNDUP was defined, util-common.c would be an empty translation unit, which gives a error with -Werror=pedantic. Tested that "make distcheck" worked. Makefile.am | 2 +- configure.ac | 1 + lib/libalpm/Makefile.am | 1 + lib/libalpm/util-common.c | 1 + lib/libalpm/util-common.h | 1 + lib/libalpm/util.c | 33 -------------- lib/libalpm/util.h | 5 +-- src/common/Makefile.am | 4 ++ src/common/util-common.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ src/common/util-common.h | 32 ++++++++++++++ src/pacman/Makefile.am | 3 +- src/pacman/util-common.c | 1 + src/pacman/util-common.h | 1 + src/pacman/util.c | 50 --------------------- src/pacman/util.h | 8 +--- 15 files changed, 157 insertions(+), 95 deletions(-) create mode 120000 lib/libalpm/util-common.c create mode 120000 lib/libalpm/util-common.h create mode 100644 src/common/Makefile.am create mode 100644 src/common/util-common.c create mode 100644 src/common/util-common.h create mode 120000 src/pacman/util-common.c create mode 120000 src/pacman/util-common.h diff --git a/Makefile.am b/Makefile.am index 0010a3e..b05feb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ if WANT_DOC SUBDIRS += doc endif -DIST_SUBDIRS = $(SUBDIRS) contrib +DIST_SUBDIRS = $(SUBDIRS) contrib src/common ACLOCAL_AMFLAGS = -I m4 --install diff --git a/configure.ac b/configure.ac index 6059fe5..aa3305d 100644 --- a/configure.ac +++ b/configure.ac @@ -462,6 +462,7 @@ AC_CONFIG_FILES([ lib/libalpm/Makefile lib/libalpm/po/Makefile.in lib/libalpm/libalpm.pc +src/common/Makefile src/pacman/Makefile src/pacman/po/Makefile.in src/util/Makefile diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index c935e2d..5cf66b9 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -53,6 +53,7 @@ libalpm_la_SOURCES = \ sync.h sync.c \ trans.h trans.c \ util.h util.c \ + util-common.h util-common.c \ version.c if !HAVE_LIBSSL diff --git a/lib/libalpm/util-common.c b/lib/libalpm/util-common.c new file mode 120000 index 0000000..cf96517 --- /dev/null +++ b/lib/libalpm/util-common.c @@ -0,0 +1 @@ +../../src/common/util-common.c \ No newline at end of file diff --git a/lib/libalpm/util-common.h b/lib/libalpm/util-common.h new file mode 120000 index 0000000..988c2ac --- /dev/null +++ b/lib/libalpm/util-common.h @@ -0,0 +1 @@ +../../src/common/util-common.h \ No newline at end of file diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c33e32a..f6e6632 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1256,37 +1256,4 @@ void _alpm_alloc_fail(size_t size) fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size); } -#ifndef HAVE_STRNDUP -/* A quick and dirty implementation derived from glibc */ -/** Determines the length of a fixed-size string. - * @param s string to be measured - * @param max maximum number of characters to search for the string end - * @return length of s or max, whichever is smaller - */ -static size_t strnlen(const char *s, size_t max) -{ - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); -} - -/** Copies a string. - * Returned string needs to be freed - * @param s string to be copied - * @param n maximum number of characters to copy - * @return pointer to the new string on success, NULL on error - */ -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: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 734e0e5..3a6b14a 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -28,6 +28,7 @@ #include "alpm.h" #include "package.h" /* alpm_pkg_t */ #include "handle.h" /* alpm_handle_t */ +#include "util-common.h" #include <stdio.h> #include <string.h> @@ -142,10 +143,6 @@ int _alpm_fnmatch(const void *pattern, const void *string); char *strsep(char **, const char *); #endif -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n); -#endif - /* check exported library symbols with: nm -C -D <lib> */ #define SYMEXPORT __attribute__((visibility("default"))) #define SYMHIDDEN __attribute__((visibility("internal"))) diff --git a/src/common/Makefile.am b/src/common/Makefile.am new file mode 100644 index 0000000..4950333 --- /dev/null +++ b/src/common/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST = \ + util-common.h util-common.c + +# vim:set ts=2 sw=2 noet: diff --git a/src/common/util-common.c b/src/common/util-common.c new file mode 100644 index 0000000..e2b5939 --- /dev/null +++ b/src/common/util-common.c @@ -0,0 +1,109 @@ +/* + * util-common.c + * + * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdlib.h> +#include <string.h> + +#include "util-common.h" + + +/** Parse the basename of a program from a path. +* @param path path to parse basename from +* +* @return everything following the final '/' +*/ +const char *mbasename(const char *path) +{ + const char *last = strrchr(path, '/'); + if(last) { + return last + 1; + } + return path; +} + +/** Parse the dirname of a program from a path. +* The path returned should be freed. +* @param path path to parse dirname from +* +* @return everything preceding the final '/' +*/ +char *mdirname(const char *path) +{ + char *ret, *last; + + /* null or empty path */ + if(path == NULL || path == '\0') { + return strdup("."); + } + + if((ret = strdup(path)) == NULL) { + return NULL; + } + + last = strrchr(ret, '/'); + + if(last != NULL) { + /* we found a '/', so terminate our string */ + if(last == ret) { + /* return "/" for root */ + last++; + } + *last = '\0'; + return ret; + } + + /* no slash found */ + free(ret); + return strdup("."); +} + +#ifndef HAVE_STRNDUP +/* A quick and dirty implementation derived from glibc */ +/** Determines the length of a fixed-size string. + * @param s string to be measured + * @param max maximum number of characters to search for the string end + * @return length of s or max, whichever is smaller + */ +static size_t strnlen(const char *s, size_t max) +{ + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); +} + +/** Copies a string. + * Returned string needs to be freed + * @param s string to be copied + * @param n maximum number of characters to copy + * @return pointer to the new string on success, NULL on error + */ +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: */ diff --git a/src/common/util-common.h b/src/common/util-common.h new file mode 100644 index 0000000..04d4e9d --- /dev/null +++ b/src/common/util-common.h @@ -0,0 +1,32 @@ +/* + * util-common.h + * + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _PM_UTIL_COMMON_H +#define _PM_UTIL_COMMON_H + +const char *mbasename(const char *path); +char *mdirname(const char *path); + +#ifndef HAVE_STRNDUP +char *strndup(const char *s, size_t n); +#endif + +#endif /* _PM_UTIL_COMMON_H */ + +/* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 311f7c5..ed51573 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -38,7 +38,8 @@ pacman_SOURCES = \ sync.c \ callback.h callback.c \ upgrade.c \ - util.h util.c + util.h util.c \ + util-common.h util-common.c LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la diff --git a/src/pacman/util-common.c b/src/pacman/util-common.c new file mode 120000 index 0000000..a2f6c50 --- /dev/null +++ b/src/pacman/util-common.c @@ -0,0 +1 @@ +../common/util-common.c \ No newline at end of file diff --git a/src/pacman/util-common.h b/src/pacman/util-common.h new file mode 120000 index 0000000..3f0b982 --- /dev/null +++ b/src/pacman/util-common.h @@ -0,0 +1 @@ +../common/util-common.h \ No newline at end of file diff --git a/src/pacman/util.c b/src/pacman/util.c index 81eec67..014be1f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -210,56 +210,6 @@ int rmrf(const char *path) } } -/** Parse the basename of a program from a path. -* @param path path to parse basename from -* -* @return everything following the final '/' -*/ -const char *mbasename(const char *path) -{ - const char *last = strrchr(path, '/'); - if(last) { - return last + 1; - } - return path; -} - -/** Parse the dirname of a program from a path. -* The path returned should be freed. -* @param path path to parse dirname from -* -* @return everything preceding the final '/' -*/ -char *mdirname(const char *path) -{ - char *ret, *last; - - /* null or empty path */ - if(path == NULL || path == '\0') { - return strdup("."); - } - - if((ret = strdup(path)) == NULL) { - return NULL; - } - - last = strrchr(ret, '/'); - - if(last != NULL) { - /* we found a '/', so terminate our string */ - if(last == ret) { - /* return "/" for root */ - last++; - } - *last = '\0'; - return ret; - } - - /* no slash found */ - free(ret); - return strdup("."); -} - /* output a string, but wrap words properly with a specified indentation */ void indentprint(const char *str, unsigned short indent, unsigned short cols) diff --git a/src/pacman/util.h b/src/pacman/util.h index 0c58a47..c38291a 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -26,6 +26,8 @@ #include <alpm_list.h> +#include "util-common.h" + #ifdef ENABLE_NLS #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ @@ -49,8 +51,6 @@ int needs_root(void); int check_syncdbs(size_t need_repos, int check_valid); unsigned short getcols(int fd); int rmrf(const char *path); -const char *mbasename(const char *path); -char *mdirname(const char *path); void indentprint(const char *str, unsigned short indent, unsigned short cols); size_t strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); @@ -80,10 +80,6 @@ int pm_asprintf(char **string, const char *format, ...); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n); -#endif - #endif /* _PM_UTIL_H */ /* vim: set ts=2 sw=2 noet: */ -- 1.8.1

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-494-g965e1de
by allan＠archlinux.org 03 Jan '13

03 Jan '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 965e1de2174148a7a6c0860a7514d9bb1969bf03 (commit) via fe0586e2400aa078f0b974ef8acc541ad9e95140 (commit) via b455bbc91db5a4cde0e6d581fa323cc8fb5b66df (commit) via 342f079f7e5c290e52deaf83700371c5ce217179 (commit) via 04821ea9cab4ecd34ad7b39ad36ffa667f70d4ee (commit) via 241d6b884a3a6c883b6c61a3b175d17e7d317fc5 (commit) via d5a6ce8ca124d1eea343314b23110e006eb313d5 (commit) via 5aaf5bcf830cb808de2484c0f3860a22a21a79b4 (commit) via 23f93118d05ff9219fa22b58a54e0f7d2c54ad86 (commit) via 163ba4016efb0628a16c4dd882fb6a2030b3efef (commit) via 495460d71737ade257d8a6a3c06d21f36c08e7dd (commit) via 6a804d55ddf150c8b716747f0c46750de06679b2 (commit) via dd3762edc4b1eb0cde2610164fd4f1a496e671b9 (commit) via 2616cb5fdce0c54e829a88318d671dd5032f0aac (commit) via 038b1815d0ab1a8c0aab4d6cfc18541df5c6cd33 (commit) via 60d258819294e7b84c7ec501d9bfe6fe6965d41c (commit) via 1dd3405813434e71ead02bdcb66b6da0544632c4 (commit) from 5186f702d3d426eec8a2c84bb2a8556ffa9e0736 (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 965e1de2174148a7a6c0860a7514d9bb1969bf03 Author: Danny George <dangets(a)gmail.com> Date: Thu Dec 13 07:53:37 2012 -0700 Add a -n option to repo-add to only add new packages Packages are already in the pkg db were given a warning, and then readded anyway. With -n specified, the warning is printed, but skips readding it. Signed-off-by: Danny George <dangets(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fe0586e2400aa078f0b974ef8acc541ad9e95140 Author: William Giokas <1007380(a)gmail.com> Date: Thu Dec 13 09:56:11 2012 -0600 makepkg: Print out full version on pkgver update When building sources with a pkgver function, makepkg will print out the original version before pkgver() is run, claiming that that is the package that will be built. This patch simply re-prints the output later, after pkgver() has been run so people can see which package they are actually building. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b455bbc91db5a4cde0e6d581fa323cc8fb5b66df Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 23:13:22 2012 +1000 Update Doxyfile A few parameters were outdated and this produced warnings from Doxygen Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 342f079f7e5c290e52deaf83700371c5ce217179 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 23:00:41 2012 +1000 doc: Fix section link in pacman-key man page Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 04821ea9cab4ecd34ad7b39ad36ffa667f70d4ee Author: Danny George <dangets(a)gmail.com> Date: Fri Dec 14 07:20:06 2012 -0700 Fixed missing asciidoc id Generated webpage contained dead links to section 'Package and Database Signature Checking' commit 241d6b884a3a6c883b6c61a3b175d17e7d317fc5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 22:32:54 2012 +1000 makepkg: use --apparent-size when du supports it Amazingly, using "sleep 1" to convince btrfs to report correct file sizes is only a 90% fix. Sometimes more sleep is needed. Instead we use the --apparent-size argument to du to get actual file sizes. This is used only on Linux as the various BSDs do not support this argument. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d5a6ce8ca124d1eea343314b23110e006eb313d5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 22:05:49 2012 +1000 Remove checks for geteuid The geteuid function is defined in POSIX and we will not support any operating systems without it. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5aaf5bcf830cb808de2484c0f3860a22a21a79b4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 22:03:51 2012 +1000 Remove Cygwin support Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 23f93118d05ff9219fa22b58a54e0f7d2c54ad86 Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Dec 20 00:57:35 2012 +0100 pacdiff: update copyright notice Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 163ba4016efb0628a16c4dd882fb6a2030b3efef Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:22:22 2012 +0100 pacdiff: Add option to overwrite, clarify remove option Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 495460d71737ade257d8a6a3c06d21f36c08e7dd Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:21:56 2012 +0100 pacdiff: check cmp's exit code rather than output Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6a804d55ddf150c8b716747f0c46750de06679b2 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:21:06 2012 +0100 pacdiff: be more verbose if we rename or remove Doesn't hurt and reassures the user that we did the right thing. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dd3762edc4b1eb0cde2610164fd4f1a496e671b9 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:20:13 2012 +0100 pacdiff: color filename and mention what we found Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2616cb5fdce0c54e829a88318d671dd5032f0aac Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 27 02:53:51 2012 -0600 Use a defined constant in delta.c for num_matches This allows compiling in both clang and gcc without running into oddities regarding const vs. defined constant values. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 038b1815d0ab1a8c0aab4d6cfc18541df5c6cd33 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 27 02:38:11 2012 -0600 util/pactree: correctly free the deps list in walk_deps() If we are reversed, then we were correctly freeing both the list and the contained data. However, we were leaking a list in the case of a non-reversed traversal. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 60d258819294e7b84c7ec501d9bfe6fe6965d41c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jan 1 22:43:20 2013 -0500 parseopts: remove superfluous continue/shift statements Fun fact about bash: the below is valid and will only ever print 'a'! fn() { continue 2 } for x in {1..5}; do for y in {a..e}; do echo "$y" fn done done Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1dd3405813434e71ead02bdcb66b6da0544632c4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 2 14:19:59 2013 +1000 Update copyright year for 2013 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 11 +++++----- contrib/bacman.sh.in | 2 +- contrib/pacdiff.sh.in | 45 ++++++++++++++++++++++++++++++++--------- contrib/updpkgsums.sh.in | 4 ++-- doc/Doxyfile | 15 +++++++++----- doc/index.txt | 2 +- doc/pacman-key.8.txt | 4 ++-- doc/pacman.conf.5.txt | 2 +- doc/repo-add.8.txt | 4 ++++ lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 11 ++++++---- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 1 + scripts/library/parseopts.sh | 6 +----- scripts/makepkg.sh.in | 13 +++++------- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-key.sh.in | 4 ++-- scripts/pacman-optimize.sh.in | 4 ++-- scripts/repo-add.sh.in | 6 ++++++ src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 9 ++------- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/pactree.c | 4 +++- 84 files changed, 158 insertions(+), 123 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Ensure a terminating newline from scriptlet output
by Simon Gomizelj 02 Jan '13

02 Jan '13

Prevent scriptlets from clobbering pacman.log because they don't end their outputs with a newline. --- lib/libalpm/util.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 033058a..4bafb3f 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -555,24 +555,35 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) exit(1); } else { /* this code runs for the parent only (wait on the child) */ - int status; - FILE *pipe_file; + int status, need_newline = 0; CLOSE(pipefd[1]); - pipe_file = fdopen(pipefd[0], "r"); - if(pipe_file == NULL) { - CLOSE(pipefd[0]); - retval = 1; - } else { - while(!feof(pipe_file)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe_file) == NULL) - break; - alpm_logaction(handle, "%s", line); - EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL); + for(;;) { + char line[BUFSIZ]; + int nbytes_r = read(pipefd[0], line, BUFSIZ); + + if(nbytes_r == 0) { + break; + } else if(nbytes_r == -1) { + if (errno != EINTR) { + _alpm_log(handle, ALPM_LOG_ERROR, _("call to read failed (%s)\n"), strerror(errno)); + CLOSE(pipefd[0]); + retval = 1; + goto cleanup; + } + continue; } - fclose(pipe_file); + + /* we'll need to manually add a newline if the read data doesn't end with one already */ + need_newline = line[nbytes_r - 1] != '\n'; + + alpm_logaction(handle, "%s", line); + EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL); } + CLOSE(pipefd[0]); + + if (need_newline) + alpm_logaction(handle, "\n"); while(waitpid(pid, &status, 0) == -1) { if(errno != EINTR) { -- 1.8.0.2

2 2

[pacman-dev] [PATCH v2 1/5] pacdiff: color filename and mention what we found
by Florian Pritz 02 Jan '13

02 Jan '13

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Now uses tput to get the color codes. contrib/pacdiff.sh.in | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index bfafda2..4c6277d 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -24,6 +24,22 @@ diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 +if tput setaf 0 &>/dev/null; then + ALL_OFF="$(tput sgr0)" + BOLD="$(tput bold)" + BLUE="${BOLD}$(tput setaf 4)" + GREEN="${BOLD}$(tput setaf 2)" + YELLOW="${BOLD}$(tput setaf 3)" + PURPLE="${BOLD}$(tput setaf 5)" +else + ALL_OFF="\e[1;0m" + BOLD="\e[1;1m" + BLUE="${BOLD}\e[1;34m" + GREEN="${BOLD}\e[1;32m" + YELLOW="${BOLD}\e[1;33m" + PURPLE="${BOLD}\e[1;35m" +fi + usage() { echo "$myname : a simple pacnew/pacorig/pacsave updater" echo "Usage : $myname [-l]" @@ -62,7 +78,15 @@ fi # see http://mywiki.wooledge.org/BashFAQ/020 while IFS= read -u 3 -r -d '' pacfile; do file="${pacfile%.pac*}" - echo "File: $file" + file_type="pac${pacfile##*.pac}" + + case $file_type in + pacnew) printf "$GREEN%s$ALL_OFF" "$file_type";; + pacorig) printf "$YELLOW%s$ALL_OFF" "$file_type";; + pacsave) printf "$BLUE%s$ALL_OFF" "$file_type";; + esac + + printf " found for $PURPLE%s$ALL_OFF\n" "$file" if [ ! -f "$file" ]; then echo " $file does not exist" rm -i "$pacfile" -- 1.8.0.2

3 11