- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Give informative error message when the to-be-downloaded file cannot be created
by Nagy Gabor 09 Feb '12

09 Feb '12

It can happen that the to-be-downloaded file cannot be created in cachedir. For example, I am an -Sup user, and it is comfortable to set --cachedir to /mnt/pendrive, which is a FAT filesystem, so files like capseo-1:0.3-2-i686.pkg.tar.xz cannot be downloaded to there. Before this patch, pacman didn't give clear output about what happens when the download code could not create the necessary file. This can be confusing with -Su. An example output: *** $ sudo pacman -S capseo bochs --cachedir /c/TEMP resolving dependencies... looking for inter-conflicts... Targets (2): bochs-2.4.6-1 capseo-1:0.3-2 Total Download Size: 0.61 MiB Total Installed Size: 2.61 MiB Proceed with installation? [Y/n] :: Retrieving packages from extra... warning: failed to retrieve some files from extra bochs-2.4.6-1-i686 611.5 KiB 118K/s 00:05 [------------------] 97% error: failed to commit transaction (unexpected error) Errors occurred, no packages were upgraded. *** After the patch, pacman will give more informative error message (and pm_errno is set properly): *** error: failed to create file '/c/TEMP/capseo-1:0.3-2-i686.pkg.tar.xz.part' for download error: failed to commit transaction (failed to retrieve some files) *** Unfortunately, the "failed to create file" error message is printed for every mirror (that can be dozens of lines), which is ugly, but at least informative... Without modifying the download logic (for example, by introducing -2 return value for _alpm_download() to indicate giving up), this ugliness cannot be eliminated. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/dload.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 97778c2..9b57b97 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -422,6 +422,9 @@ static int curl_download_internal(struct dload_payload *payload, if(localf == NULL) { localf = fopen(payload->tempfile_name, payload->tempfile_openmode); if(localf == NULL) { + handle->pm_errno = ALPM_ERR_RETRIEVE; + _alpm_log(handle, ALPM_LOG_ERROR, + _("failed to create file '%s' for download\n"), payload->tempfile_name); goto cleanup; } } -- 1.7.9

2 2

[pacman-dev] [PATCH] Remove a pm_errno = 0 line
by Nagy Gabor 09 Feb '12

09 Feb '12

In the download code a successful package-download could reset the previously set pm_errno to 0, which is unwanted. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/dload.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9b57b97..8e754f1 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -388,7 +388,6 @@ static int curl_download_internal(struct dload_payload *payload, /* shortcut to our handle within the payload */ alpm_handle_t *handle = payload->handle; CURL *curl = get_libcurl_handle(handle); - handle->pm_errno = 0; payload->tempfile_openmode = "wb"; if(!payload->remote_name) { -- 1.7.9

2 4

[pacman-dev] [PATCH] use _alpm_access in a few more places for increased debugging info
by Florian Pritz 07 Feb '12

07 Feb '12

pacman -u <pkg> returns a bogus "could not find or read package" if the file is on a fuse file system that doesn't allow root access. Debug output isn't very helpful here either so we should log why the access check failed. The other 2 checks already log something when failing so logging a more specific error won't hurt either. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3188a2f..4b43f21 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -316,7 +316,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, } /* attempt to access the package file, ensure it exists */ - if(access(pkgfile, R_OK) != 0) { + if(_alpm_access(handle, NULL, pkgfile, R_OK) != 0) { RET_ERR(handle, ALPM_ERR_PKG_NOT_FOUND, -1); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index c4673b1..f162199 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -86,7 +86,7 @@ static int sync_db_validate(alpm_db_t *db) } /* we can skip any validation if the database doesn't exist */ - if(access(dbpath, R_OK) != 0 && errno == ENOENT) { + if(_alpm_access(db->handle, NULL, dbpath, R_OK) != 0 && errno == ENOENT) { db->status &= ~DB_STATUS_EXISTS; db->status |= DB_STATUS_MISSING; _alpm_log(db->handle, ALPM_LOG_WARNING, diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 24bf1fc..1128589 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -686,7 +686,7 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) } else if(!S_ISDIR(buf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping cachedir, not a directory: %s\n", cachedir); - } else if(access(cachedir, W_OK) != 0) { + } else if(_alpm_access(handle, NULL, cachedir, W_OK) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping cachedir, not writable: %s\n", cachedir); } else if(!(buf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) { -- 1.7.9

1 0

[pacman-dev] [translation] pacman 4.0.2 string freeze
by Dan McGee 06 Feb '12

06 Feb '12

More info: http://www.archlinux.org/pacman/translation-help.html Transifex page: https://www.transifex.net/projects/p/archlinux-pacman/r/4-0-2/ Thanks! -Dan

5 7

[pacman-dev] [PATCH] makepkg.sh.in - if both -r and -i are provided, only remove makedeps
by andrew.gregory.8＠gmail.com 06 Feb '12

06 Feb '12

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8274255..91457fd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2305,13 +2305,17 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then warning "$(gettext "Skipping dependency checks.")" fi elif type -p "${PACMAN%% *}" >/dev/null; then - if (( RMDEPS )); then + if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi deperr=0 msg "$(gettext "Checking runtime dependencies...")" resolve_deps ${depends[@]} || deperr=1 + + if (( RMDEPS && INSTALL )); then + original_pkglist=($(run_pacman -Qq)) # required by remove_dep + fi msg "$(gettext "Checking buildtime dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 -- 1.7.9

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-182-gf55be48
by dan＠archlinux.org 06 Feb '12

06 Feb '12

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 f55be4897799c5a6dcb454455ad9edcfc36f8495 (commit) via b7c06d6d678ebe6a434b2387c3bda14647113f32 (commit) via b488f229d2ec4f2e4b9e746d68422460ca664715 (commit) via f12effc6ff4605ea81b3b765ff1655107aad29d8 (commit) via d8e1c450a3fcdcbd46fd930f2804d0a61087f968 (commit) via 52afce0a106cac34b4a96cbb6adf6f6bd77b6456 (commit) via 216db87f999b244738ade141fa06e666aa38db72 (commit) via 0fdf0b19ced256d395366b24a669960416341d37 (commit) via 17e71fc908df4a5df48c9054f6c0621d3c7b80ea (commit) via 090ea289429c86e7a6f256ccb582d70d32d04013 (commit) via e01fdc3dba36336bf4acbbf5ea1e3f7ac9c6fb6a (commit) via e8db984ce5997ffabafab2584fa7f00789ff3afd (commit) via 47313acee48029bfdd1ee34bf1947b962ccff283 (commit) via fcbae69fe81d080478bbd9809af5696bbbfe9d95 (commit) from 4f54bde4390d6d4302273a835e79ab1f2827adf8 (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 f55be4897799c5a6dcb454455ad9edcfc36f8495 Merge: b488f22 b7c06d6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 6 05:50:48 2012 -0600 Merge branch 'maint' Conflicts: lib/libalpm/alpm_list.c commit b488f229d2ec4f2e4b9e746d68422460ca664715 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 1 23:45:52 2012 -0600 ALPM API adjustments for sanity and consistency This makes several small adjustments to our exposed method names, and in one case, parameters. The justification here is to make methods less odd in their naming convention. If a method takes an alpm_db_t argument, the method should be named 'alpm_db_*', but perhaps more importantly, if it doesn't take a database as the first parameter, it should not. Summary of changes: alpm_db_register_sync -> alpm_register_syncdb alpm_db_unregister_all -> alpm_unregister_all_syncdbs alpm_option_get_localdb -> aplpm_get_localdb alpm_option_get_syncdbs -> aplpm_get_syncdbs alpm_db_readgroup -> alpm_db_get_group alpm_db_set_pkgreason -> alpm_pkg_set_reason All methods keep the same argument list except for alpm_pkg_set_reason; there we drop the 'handle' argument as it can be retrieved from the passed in package object. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f12effc6ff4605ea81b3b765ff1655107aad29d8 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 1 23:14:01 2012 -0600 alpm.h: enum cleanups, comment formatting cleanup Don't use trailing commas in enums if people really want to use a strict C89 compiler, and document why on earth one particular enum uses bitmask values when it doesn't seem necessary. With comments, shoot for more consistency. When something is a one-liner, keep it that way and move the whole /** sequence */ to one line. When it needs more than one line, ensure we format most of them in a similar fashion. Two minor function signature adjustments are made that don't change anything other than matching the parameter name (name -> filename) and fitting in with our coding style (type* var -> type *var). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8e1c450a3fcdcbd46fd930f2804d0a61087f968 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 6 05:48:49 2012 -0600 Remove last explicit include of config.h Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 89 +++++++++++++++++++-------------------- lib/libalpm/alpm_list.c | 5 ++- lib/libalpm/be_local.c | 24 ++++++++++ lib/libalpm/db.c | 32 +------------- lib/libalpm/diskspace.c | 2 - lib/libalpm/handle.c | 24 +++++----- lib/libalpm/po/lt.po | 41 +++++++++--------- lib/libalpm/sync.c | 2 +- scripts/makepkg.sh.in | 15 +++++- src/pacman/callback.c | 4 +- src/pacman/conf.c | 2 +- src/pacman/database.c | 4 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 4 +- src/pacman/po/ca.po | 20 ++++---- src/pacman/po/cs.po | 10 ++-- src/pacman/po/da.po | 10 ++-- src/pacman/po/de.po | 10 ++-- src/pacman/po/el.po | 10 ++-- src/pacman/po/en_GB.po | 10 ++-- src/pacman/po/es.po | 19 ++++---- src/pacman/po/fi.po | 22 +++++----- src/pacman/po/fr.po | 10 ++-- src/pacman/po/hu.po | 10 ++-- src/pacman/po/it.po | 10 ++-- src/pacman/po/kk.po | 10 ++-- src/pacman/po/lt.po | 52 +++++++++++----------- src/pacman/po/nb.po | 37 ++++++++-------- src/pacman/po/pacman.pot | 10 ++-- src/pacman/po/pl.po | 10 ++-- src/pacman/po/pt.po | 10 ++-- src/pacman/po/pt_BR.po | 10 ++-- src/pacman/po/ro.po | 10 ++-- src/pacman/po/ru.po | 10 ++-- src/pacman/po/sk.po | 10 ++-- src/pacman/po/sr.po | 10 ++-- src/pacman/po/sr(a)latin.po | 10 ++-- src/pacman/po/sv.po | 10 ++-- src/pacman/po/tr.po | 10 ++-- src/pacman/po/uk.po | 10 ++-- src/pacman/po/zh_CN.po | 10 ++-- src/pacman/po/zh_TW.po | 10 ++-- src/pacman/query.c | 14 +++--- src/pacman/remove.c | 6 +- src/pacman/sync.c | 22 +++++----- src/pacman/util.c | 39 +++++++++++++---- src/pacman/util.h | 3 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 6 +- src/util/testdb.c | 4 +- test/pacman/tests/upgrade001.py | 1 + test/pacman/tests/upgrade002.py | 1 + test/pacman/tests/upgrade003.py | 1 + test/pacman/tests/upgrade004.py | 1 + 55 files changed, 381 insertions(+), 351 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-60-gb7c06d6
by dan＠archlinux.org 06 Feb '12

06 Feb '12

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, maint has been updated via b7c06d6d678ebe6a434b2387c3bda14647113f32 (commit) via 52afce0a106cac34b4a96cbb6adf6f6bd77b6456 (commit) via 216db87f999b244738ade141fa06e666aa38db72 (commit) via 0fdf0b19ced256d395366b24a669960416341d37 (commit) via 17e71fc908df4a5df48c9054f6c0621d3c7b80ea (commit) via 090ea289429c86e7a6f256ccb582d70d32d04013 (commit) via e01fdc3dba36336bf4acbbf5ea1e3f7ac9c6fb6a (commit) via e8db984ce5997ffabafab2584fa7f00789ff3afd (commit) from 47313acee48029bfdd1ee34bf1947b962ccff283 (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 b7c06d6d678ebe6a434b2387c3bda14647113f32 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 4 09:07:02 2012 -0500 makepkg.sh.in - if both -r and -i are provided, only remove makedeps Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52afce0a106cac34b4a96cbb6adf6f6bd77b6456 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 6 05:44:33 2012 -0600 Update translations from Transifex The pacman-scripts catalog is omitted here due to various newline errors I don't have the time to fix right now. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 216db87f999b244738ade141fa06e666aa38db72 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 4 11:05:13 2012 -0500 remove.c: make "target not found" error consistent with sync.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0fdf0b19ced256d395366b24a669960416341d37 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 4 09:06:05 2012 -0500 makepkg.sh.in - fix remove_deps test for deps to be removed Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 17e71fc908df4a5df48c9054f6c0621d3c7b80ea Author: Mantas Mikulėnas <grawity(a)nullroute.eu.org> Date: Fri Feb 3 15:22:44 2012 +0200 makepkg: add forgotten newline in help output Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 090ea289429c86e7a6f256ccb582d70d32d04013 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 3 10:59:14 2012 -0600 pactest: check return code in some upgrade tests Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e01fdc3dba36336bf4acbbf5ea1e3f7ac9c6fb6a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Feb 2 22:36:46 2012 -0600 Add simple integer-only pow() implementation We hardly need the complexity (or slowness) provided by the libm power function; add a super-cheap one that suits our needs and is specialized for the values we plan on passing in. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e8db984ce5997ffabafab2584fa7f00789ff3afd Author: Thomas Dziedzic <gostrc(a)gmail.com> Date: Thu Feb 2 16:43:40 2012 -0600 Fix FS#27924: don't display negative zeroes Dan: don't compute lower bound unless needed, flip argument order so out values are last, add param Doxygen documentation. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/lt.po | 41 +++++++++++++++--------------- scripts/makepkg.sh.in | 10 +++++-- src/pacman/callback.c | 4 +- src/pacman/package.c | 4 +- src/pacman/po/ca.po | 20 +++++++------- src/pacman/po/cs.po | 10 +++--- src/pacman/po/da.po | 10 +++--- src/pacman/po/de.po | 10 +++--- src/pacman/po/el.po | 10 +++--- src/pacman/po/en_GB.po | 10 +++--- src/pacman/po/es.po | 19 +++++++------ src/pacman/po/fi.po | 22 ++++++++-------- src/pacman/po/fr.po | 10 +++--- src/pacman/po/hu.po | 10 +++--- src/pacman/po/it.po | 10 +++--- src/pacman/po/kk.po | 10 +++--- src/pacman/po/lt.po | 52 +++++++++++++++++++------------------- src/pacman/po/nb.po | 37 +++++++++++++-------------- src/pacman/po/pacman.pot | 10 +++--- src/pacman/po/pl.po | 10 +++--- src/pacman/po/pt.po | 10 +++--- src/pacman/po/pt_BR.po | 10 +++--- src/pacman/po/ro.po | 10 +++--- src/pacman/po/ru.po | 10 +++--- src/pacman/po/sk.po | 10 +++--- src/pacman/po/sr.po | 10 +++--- src/pacman/po/sr(a)latin.po | 10 +++--- src/pacman/po/sv.po | 10 +++--- src/pacman/po/tr.po | 10 +++--- src/pacman/po/uk.po | 10 +++--- src/pacman/po/zh_CN.po | 10 +++--- src/pacman/po/zh_TW.po | 10 +++--- src/pacman/remove.c | 2 +- src/pacman/util.c | 35 ++++++++++++++++++++------ src/pacman/util.h | 3 +- test/pacman/tests/upgrade001.py | 1 + test/pacman/tests/upgrade002.py | 1 + test/pacman/tests/upgrade003.py | 1 + test/pacman/tests/upgrade004.py | 1 + 39 files changed, 256 insertions(+), 227 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg.sh.in - fix remove_deps test for deps to be removed
by andrew.gregory.8＠gmail.com 06 Feb '12

06 Feb '12

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8274255..cca0fac 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -519,7 +519,7 @@ remove_deps() { local deplist deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}") || true)) - if [[ -n deplist ]]; then + if [[ -z deplist ]]; then return fi -- 1.7.9

2 1

[pacman-dev] [PATCH] remove.c: make "target not found" error consistent with sync.c
by andrew.gregory.8＠gmail.com 04 Feb '12

04 Feb '12

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/remove.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 3de5769..508cd20 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -54,7 +54,7 @@ static int remove_target(const char *target) /* fallback to group */ alpm_group_t *grp = alpm_db_readgroup(db_local, target); if(grp == NULL) { - pm_printf(ALPM_LOG_ERROR, "'%s': target not found\n", target); + pm_printf(ALPM_LOG_ERROR, _("target not found: %s\n"), target); return -1; } for(p = grp->packages; p; p = alpm_list_next(p)) { -- 1.7.9

1 0

[pacman-dev] [PATCH 1/2] alpm.h: enum cleanups, comment formatting cleanup
by Dan McGee 02 Feb '12

02 Feb '12

Don't use trailing commas in enums if people really want to use a strict C89 compiler, and document why on earth one particular enum uses bitmask values when it doesn't seem necessary. With comments, shoot for more consistency. When something is a one-liner, keep it that way and move the whole /** sequence */ to one line. When it needs more than one line, ensure we format most of them in a similar fashion. Two minor function signature adjustments are made that don't change anything other than matching the parameter name (name -> filename) and fitting in with our coding style (type* var -> type *var). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 50 +++++++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 27 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9ffdebc..5b7f627 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -33,8 +33,6 @@ extern "C" { #include <alpm_list.h> -#define DEPRECATED __attribute__((deprecated)) - /* * Arch Linux Package Management library */ @@ -51,10 +49,7 @@ typedef int64_t alpm_time_t; * These ones are used in multiple contexts, so are forward-declared. */ -/** - * Install reasons. - * Why the package was installed. - */ +/** Package install reasons. */ typedef enum _alpm_pkgreason_t { /** Explicitly requested by the user. */ ALPM_PKG_REASON_EXPLICIT = 0, @@ -62,6 +57,7 @@ typedef enum _alpm_pkgreason_t { ALPM_PKG_REASON_DEPEND = 1 } alpm_pkgreason_t; +/** Location a package object was loaded from. */ typedef enum _alpm_pkgfrom_t { PKG_FROM_FILE = 1, PKG_FROM_LOCALDB, @@ -94,9 +90,7 @@ typedef enum _alpm_fileconflicttype_t { ALPM_FILECONFLICT_FILESYSTEM } alpm_fileconflicttype_t; -/** - * PGP signature verification options - */ +/** PGP signature verification options */ typedef enum _alpm_siglevel_t { ALPM_SIG_PACKAGE = (1 << 0), ALPM_SIG_PACKAGE_OPTIONAL = (1 << 1), @@ -111,9 +105,7 @@ typedef enum _alpm_siglevel_t { ALPM_SIG_USE_DEFAULT = (1 << 31) } alpm_siglevel_t; -/** - * PGP signature verification status return codes - */ +/** PGP signature verification status return codes */ typedef enum _alpm_sigstatus_t { ALPM_SIGSTATUS_VALID, ALPM_SIGSTATUS_KEY_EXPIRED, @@ -123,9 +115,7 @@ typedef enum _alpm_sigstatus_t { ALPM_SIGSTATUS_INVALID } alpm_sigstatus_t; -/** - * PGP signature verification status return codes - */ +/** PGP signature verification status return codes */ typedef enum _alpm_sigvalidity_t { ALPM_SIGVALIDITY_FULL, ALPM_SIGVALIDITY_MARGINAL, @@ -154,7 +144,7 @@ typedef struct _alpm_depend_t { typedef struct _alpm_depmissing_t { char *target; alpm_depend_t *depend; - /* this is used in case of remove dependency error only */ + /* this is used only in the case of a remove dependency error */ char *causingpkg; } alpm_depmissing_t; @@ -231,7 +221,8 @@ typedef struct _alpm_pgpkey_t { char pubkey_algo; } alpm_pgpkey_t; -/** Signature result. Contains the key, status, and validity of a given +/** + * Signature result. Contains the key, status, and validity of a given * signature. */ typedef struct _alpm_sigresult_t { @@ -240,7 +231,8 @@ typedef struct _alpm_sigresult_t { alpm_sigvalidity_t validity; } alpm_sigresult_t; -/** Signature list. Contains the number of signatures found and a pointer to an +/** + * Signature list. Contains the number of signatures found and a pointer to an * array of results. The array is of size count. */ typedef struct _alpm_siglist_t { @@ -252,9 +244,7 @@ typedef struct _alpm_siglist_t { * Logging facilities */ -/** - * Logging Levels - */ +/** Logging Levels */ typedef enum _alpm_loglevel_t { ALPM_LOG_ERROR = 1, ALPM_LOG_WARNING = (1 << 1), @@ -265,7 +255,8 @@ typedef enum _alpm_loglevel_t { typedef void (*alpm_cb_log)(alpm_loglevel_t, const char *, va_list); int alpm_logaction(alpm_handle_t *handle, const char *fmt, ...); -/** Events. +/** + * Events. * NULL parameters are passed to in all events unless specified otherwise. */ typedef enum _alpm_event_t { @@ -346,13 +337,18 @@ typedef enum _alpm_event_t { /** Disk space usage will be computed for a package */ ALPM_EVENT_DISKSPACE_START, /** Disk space usage was computed for a package */ - ALPM_EVENT_DISKSPACE_DONE, + ALPM_EVENT_DISKSPACE_DONE } alpm_event_t; /** Event callback */ typedef void (*alpm_cb_event)(alpm_event_t, void *, void *); -/** Questions */ +/** + * Questions. + * Unlike the events or progress enumerations, this enum has bitmask values + * so a frontend can use a bitmask map to supply preselected answers to the + * different types of questions. + */ typedef enum _alpm_question_t { ALPM_QUESTION_INSTALL_IGNOREPKG = 1, ALPM_QUESTION_REPLACE_PKG = (1 << 1), @@ -375,7 +371,7 @@ typedef enum _alpm_progress_t { ALPM_PROGRESS_CONFLICTS_START, ALPM_PROGRESS_DISKSPACE_START, ALPM_PROGRESS_INTEGRITY_START, - ALPM_PROGRESS_LOAD_START, + ALPM_PROGRESS_LOAD_START } alpm_progress_t; /** Progress callback */ @@ -653,7 +649,7 @@ alpm_list_t *alpm_db_get_groupcache(alpm_db_t *db); * @param needles a list of regular expressions to search for * @return the list of packages matching all regular expressions on success, NULL on error */ -alpm_list_t *alpm_db_search(alpm_db_t *db, const alpm_list_t* needles); +alpm_list_t *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); /** Set install reason for a package in db. * @param handle the context handle @@ -1112,7 +1108,7 @@ char *alpm_dep_compute_string(const alpm_depend_t *dep); */ /* checksums */ -char *alpm_compute_md5sum(const char *name); +char *alpm_compute_md5sum(const char *filename); char *alpm_compute_sha256sum(const char *filename); /** @addtogroup alpm_api_errors Error Codes -- 1.7.9

1 1