- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-43-g31cb210
by dan＠archlinux.org 12 Apr '11

12 Apr '11

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 31cb2100573c54c8996edbc8a7321d48b990c149 (commit) via dbd7d49d31d337d0b63d7945fd3308f903a75fd2 (commit) from b750d3e7b0b0d377ea856c7915f9c6acf6d512d8 (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 31cb2100573c54c8996edbc8a7321d48b990c149 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 9 17:26:55 2011 -0500 bacman: fix the fact that the depends file no longer exists Addresses FS#23641. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbd7d49d31d337d0b63d7945fd3308f903a75fd2 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sat Apr 9 23:28:00 2011 +0200 alpm.h: document transaction flags Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 16 +++++++--------- lib/libalpm/alpm.h | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/4] Make gpgme optional
by Rémy Oudompheng 11 Apr '11

11 Apr '11

These patches (partially already submitted before) make linking with gpgme optional, and also implement a configuration option for pacman to use an external tool for signature checking. The given example is "gpg --verify - $filename", but "/bin/true" could be used to totally bypass checking. To apply on branch 'master', after the previously posted patch set. Rémy Oudompheng (4): handle: define a new callback for signature check signing: make gpgme optional and default to user callback pacman: add a configuration key for signature checking command pacman: implement signature check callback using an external command configure.ac | 19 ++++++++++- etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 12 +++++++ lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 13 ++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/signing.c | 33 +++++++++++++++++++-- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 6 ++- src/pacman/callback.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/callback.h | 3 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 4 ++ 13 files changed, 167 insertions(+), 8 deletions(-) -- 1.7.4.4

2 7

[pacman-dev] [PATCH 0/3] Signature checks for local packages
by Rémy Oudompheng 11 Apr '11

11 Apr '11

These patches fix the way local packages have their signatures checked by libalpm. Rémy Oudompheng (3): libalpm: correctly load signatures for package files libalpm: add a public function to get signature contents sync.c: check signatures for local package files when available lib/libalpm/alpm.h | 1 + lib/libalpm/be_package.c | 18 +++++------------- lib/libalpm/signing.c | 6 ++++++ lib/libalpm/sync.c | 19 ++++++++++++++----- 4 files changed, 26 insertions(+), 18 deletions(-) -- 1.7.4.4

2 4

[pacman-dev] [PATCH] libalpm: consistently use int as return type for option setters
by Rémy Oudompheng 11 Apr '11

11 Apr '11

Currently the only error case is when handle == NULL. However several handle functions return -1 on this error, and a uniform API makes things simpler. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- This patch introduces an API change. On branch 'master' lib/libalpm/alpm.h | 34 +++++++++--------- lib/libalpm/handle.c | 97 ++++++++++++++++++++++++++----------------------- src/pacman/pacman.c | 13 ++++--- 3 files changed, 76 insertions(+), 68 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b08191d..82eb11e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -99,16 +99,16 @@ typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, */ alpm_cb_log alpm_option_get_logcb(void); -void alpm_option_set_logcb(alpm_cb_log cb); +int alpm_option_set_logcb(alpm_cb_log cb); alpm_cb_download alpm_option_get_dlcb(void); -void alpm_option_set_dlcb(alpm_cb_download cb); +int alpm_option_set_dlcb(alpm_cb_download cb); alpm_cb_fetch alpm_option_get_fetchcb(void); -void alpm_option_set_fetchcb(alpm_cb_fetch cb); +int alpm_option_set_fetchcb(alpm_cb_fetch cb); alpm_cb_totaldl alpm_option_get_totaldlcb(void); -void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); +int alpm_option_set_totaldlcb(alpm_cb_totaldl cb); const char *alpm_option_get_root(void); int alpm_option_set_root(const char *root); @@ -118,7 +118,7 @@ int alpm_option_set_dbpath(const char *dbpath); alpm_list_t *alpm_option_get_cachedirs(void); int alpm_option_add_cachedir(const char *cachedir); -void alpm_option_set_cachedirs(alpm_list_t *cachedirs); +int alpm_option_set_cachedirs(alpm_list_t *cachedirs); int alpm_option_remove_cachedir(const char *cachedir); const char *alpm_option_get_logfile(void); @@ -131,36 +131,36 @@ const char *alpm_option_get_signaturedir(void); int alpm_option_set_signaturedir(const char *signaturedir); int alpm_option_get_usesyslog(void); -void alpm_option_set_usesyslog(int usesyslog); +int alpm_option_set_usesyslog(int usesyslog); alpm_list_t *alpm_option_get_noupgrades(void); -void alpm_option_add_noupgrade(const char *pkg); -void alpm_option_set_noupgrades(alpm_list_t *noupgrade); +int alpm_option_add_noupgrade(const char *pkg); +int alpm_option_set_noupgrades(alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(const char *pkg); alpm_list_t *alpm_option_get_noextracts(void); -void alpm_option_add_noextract(const char *pkg); -void alpm_option_set_noextracts(alpm_list_t *noextract); +int alpm_option_add_noextract(const char *pkg); +int alpm_option_set_noextracts(alpm_list_t *noextract); int alpm_option_remove_noextract(const char *pkg); alpm_list_t *alpm_option_get_ignorepkgs(void); -void alpm_option_add_ignorepkg(const char *pkg); -void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); +int alpm_option_add_ignorepkg(const char *pkg); +int alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); alpm_list_t *alpm_option_get_ignoregrps(void); -void alpm_option_add_ignoregrp(const char *grp); -void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); +int alpm_option_add_ignoregrp(const char *grp); +int alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); int alpm_option_remove_ignoregrp(const char *grp); const char *alpm_option_get_arch(void); -void alpm_option_set_arch(const char *arch); +int alpm_option_set_arch(const char *arch); int alpm_option_get_usedelta(void); -void alpm_option_set_usedelta(int usedelta); +int alpm_option_set_usedelta(int usedelta); int alpm_option_get_checkspace(void); -void alpm_option_set_checkspace(int checkspace); +int alpm_option_set_checkspace(int checkspace); pmdb_t *alpm_option_get_localdb(void); alpm_list_t *alpm_option_get_syncdbs(void); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index fd40f19..b55b02a 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -274,40 +274,32 @@ alpm_list_t SYMEXPORT *alpm_option_get_syncdbs() return handle->dbs_sync; } -void SYMEXPORT alpm_option_set_logcb(alpm_cb_log cb) +int SYMEXPORT alpm_option_set_logcb(alpm_cb_log cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->logcb = cb; + return 0; } -void SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb) +int SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->dlcb = cb; + return 0; } -void SYMEXPORT alpm_option_set_fetchcb(alpm_cb_fetch cb) +int SYMEXPORT alpm_option_set_fetchcb(alpm_cb_fetch cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->fetchcb = cb; + return 0; } -void SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb) +int SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->totaldlcb = cb; + return 0; } int SYMEXPORT alpm_option_set_root(const char *root) @@ -420,11 +412,12 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) return 0; } -void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs) +int SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->cachedirs) FREELIST(handle->cachedirs); if(cachedirs) handle->cachedirs = cachedirs; + return 0; } int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir) @@ -495,23 +488,26 @@ int SYMEXPORT alpm_option_set_signaturedir(const char *signaturedir) return 0; } -void SYMEXPORT alpm_option_set_usesyslog(int usesyslog) +int SYMEXPORT alpm_option_set_usesyslog(int usesyslog) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->usesyslog = usesyslog; + return 0; } -void SYMEXPORT alpm_option_add_noupgrade(const char *pkg) +int SYMEXPORT alpm_option_add_noupgrade(const char *pkg) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); + return 0; } -void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) +int SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->noupgrade) FREELIST(handle->noupgrade); if(noupgrade) handle->noupgrade = noupgrade; + return 0; } int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) @@ -526,17 +522,19 @@ int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) return 0; } -void SYMEXPORT alpm_option_add_noextract(const char *pkg) +int SYMEXPORT alpm_option_add_noextract(const char *pkg) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); + return 0; } -void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) +int SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->noextract) FREELIST(handle->noextract); if(noextract) handle->noextract = noextract; + return 0; } int SYMEXPORT alpm_option_remove_noextract(const char *pkg) @@ -551,17 +549,19 @@ int SYMEXPORT alpm_option_remove_noextract(const char *pkg) return 0; } -void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg) +int SYMEXPORT alpm_option_add_ignorepkg(const char *pkg) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); + return 0; } -void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) +int SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->ignorepkg) FREELIST(handle->ignorepkg); if(ignorepkgs) handle->ignorepkg = ignorepkgs; + return 0; } int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) @@ -576,17 +576,19 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) return 0; } -void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) +int SYMEXPORT alpm_option_add_ignoregrp(const char *grp) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); + return 0; } -void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) +int SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->ignoregrp) FREELIST(handle->ignoregrp); if(ignoregrps) handle->ignoregrp = ignoregrps; + return 0; } int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) @@ -601,23 +603,26 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) return 0; } -void SYMEXPORT alpm_option_set_arch(const char *arch) +int SYMEXPORT alpm_option_set_arch(const char *arch) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->arch) FREE(handle->arch); if(arch) handle->arch = strdup(arch); + return 0; } -void SYMEXPORT alpm_option_set_usedelta(int usedelta) +int SYMEXPORT alpm_option_set_usedelta(int usedelta) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->usedelta = usedelta; + return 0; } -void SYMEXPORT alpm_option_set_checkspace(int checkspace) +int SYMEXPORT alpm_option_set_checkspace(int checkspace) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->checkspace = checkspace; + return 0; } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 74659c5..c5c83d7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -412,7 +412,7 @@ static void setlibpaths(void) #define check_optarg() if(!optarg) { return 1; } -typedef void (*fn_add) (const char *s); +typedef int (*fn_add) (const char *s); static int parsearg_util_addlist(fn_add fn) { @@ -810,17 +810,19 @@ static int parseargs(int argc, char *argv[]) } /* helper for being used with setrepeatingoption */ -static void option_add_holdpkg(const char *name) { +static int option_add_holdpkg(const char *name) { config->holdpkg = alpm_list_add(config->holdpkg, strdup(name)); + return 0; } /* helper for being used with setrepeatingoption */ -static void option_add_syncfirst(const char *name) { +static int option_add_syncfirst(const char *name) { config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); + return 0; } /* helper for being used with setrepeatingoption */ -static void option_add_cleanmethod(const char *value) { +static int option_add_cleanmethod(const char *value) { if (strcmp(value, "KeepInstalled") == 0) { config->cleanmethod |= PM_CLEAN_KEEPINST; } else if (strcmp(value, "KeepCurrent") == 0) { @@ -829,6 +831,7 @@ static void option_add_cleanmethod(const char *value) { pm_printf(PM_LOG_ERROR, _("invalid value for 'CleanMethod' : '%s'\n"), value); } + return 0; } /** Add repeating options such as NoExtract, NoUpgrade, etc to libalpm @@ -839,7 +842,7 @@ static void option_add_cleanmethod(const char *value) { * @param optionfunc a function pointer to an alpm_option_add_* function */ static void setrepeatingoption(char *ptr, const char *option, - void (*optionfunc)(const char*)) + int (*optionfunc)(const char*)) { char *q; -- 1.7.4.4

2 1

[pacman-dev] Newsletter Mon, 11 Apr 2011 15:17:55 -0300
by dan＠archlinux.org 11 Apr '11

11 Apr '11

How are you bud! Do you want an effective future, increase in money earning, and the recognition of all? Today only: We can assist with Diplomas from prestigious universities based on your present knowledge and professional experience. Get a Degree in 4 weeks with our program! ~Our program will let EVERYONE with professional experience get a 100% verified Degree: ~Doctorate ~Bachelors ~Masters - Think about it... - You can realize YOUR Dreams! - Live a much better life by earning or upgrading your degree. This is a splendid chance to make a right move and receive your due benefits... if you are qualified but are lacking that piece of paper. Get one from us in a fraction of the time. Call 7 days a week! to start improving your life! ~CALL US~ 1-310-205-2502 Please leave us a message with your name and phone number with country code if outside USA and we'll call you asap. It's your decision... Make the right decision. Best wishes. Do Not Reply to this Email. We do not reply to text inquiries, and our server will reject all response traffic. We apologize for any inconvenience this may have caused you.

1 0

[pacman-dev] [PATCH] alpm.h: document transaction flags
by Rémy Oudompheng 10 Apr '11

10 Apr '11

Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- This documentation is inspired from pacma's help strings. Note that the help string for pacman -Ru is highly misleading is the sense that it does not clearly state that it *filters* the input package list. lib/libalpm/alpm.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1bb0b81..cb643d2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -579,23 +579,39 @@ pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync); /** Transaction flags */ typedef enum _pmtransflag_t { + /** Ignore dependency checks. */ PM_TRANS_FLAG_NODEPS = 1, + /** Ignore file conflicts and overwrite files. */ PM_TRANS_FLAG_FORCE = (1 << 1), + /** Delete files even if they are tagged as backup. */ PM_TRANS_FLAG_NOSAVE = (1 << 2), + /** Ignore version numbers when checking dependencies. */ PM_TRANS_FLAG_NODEPVERSION = (1 << 3), + /** Remove also any packages depending on a package being removed. */ PM_TRANS_FLAG_CASCADE = (1 << 4), + /** Remove packages and their unneeded deps (not explicitly installed). */ PM_TRANS_FLAG_RECURSE = (1 << 5), + /** Modify database but do not commit changes to the filesystem. */ PM_TRANS_FLAG_DBONLY = (1 << 6), /* (1 << 7) flag can go here */ + /** Use PM_PKG_REASON_DEPEND when installing packages. */ PM_TRANS_FLAG_ALLDEPS = (1 << 8), + /** Only download packages and do not actually install. */ PM_TRANS_FLAG_DOWNLOADONLY = (1 << 9), + /** Do not execute install scriptlets after installing. */ PM_TRANS_FLAG_NOSCRIPTLET = (1 << 10), + /** Ignore dependency conflicts. */ PM_TRANS_FLAG_NOCONFLICTS = (1 << 11), /* (1 << 12) flag can go here */ + /** Do not install a package if it is already installed and up to date. */ PM_TRANS_FLAG_NEEDED = (1 << 13), + /** Use PM_PKG_REASON_EXPLICIT when installing packages. */ PM_TRANS_FLAG_ALLEXPLICIT = (1 << 14), + /** Do not remove a package if it is needed by another one. */ PM_TRANS_FLAG_UNNEEDED = (1 << 15), + /** Remove also explicitly installed unneeded deps (use with PM_TRANS_FLAG_RECURSE). */ PM_TRANS_FLAG_RECURSEALL = (1 << 16), + /** Do not lock the database during the operation. */ PM_TRANS_FLAG_NOLOCK = (1 << 17) } pmtransflag_t; -- 1.7.4.4

1 0

[pacman-dev] [PATCH 3/7] libalpm: switch default VerifySig to Optional
by Xavier Chantry 10 Apr '11

10 Apr '11

Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- lib/libalpm/alpm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b08191d..81877cc 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -254,8 +254,8 @@ int alpm_db_check_pgp_signature(pmdb_t *db); /* GPG signature verification option */ typedef enum _pgp_verify_t { - PM_PGP_VERIFY_ALWAYS, PM_PGP_VERIFY_OPTIONAL, + PM_PGP_VERIFY_ALWAYS, PM_PGP_VERIFY_NEVER } pgp_verify_t; -- 1.7.4.2

2 2

[pacman-dev] [PATCH] Fix broken documentation for alpm_trans_prepare()
by Rémy Oudompheng 10 Apr '11

10 Apr '11

The current state of the code does not allow to see immediately that it returns a list of pmdepmissing_t structures. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- alpm_trans_prepare() is really unusable if the type of its return value is obfuscated like this. This patch applies on branch "maint". lib/libalpm/deps.c | 2 +- lib/libalpm/remove.c | 8 ++++++++ lib/libalpm/trans.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index dc85b31..36d6e1a 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -261,7 +261,7 @@ pmpkg_t SYMEXPORT *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstring) * @param reversedeps handles the backward dependencies * @param remove an alpm_list_t* of packages to be removed * @param upgrade an alpm_list_t* of packages to be upgraded (remove-then-upgrade) - * @return an alpm_list_t* of pmpkg_t* of pmdepmissing_t pointers. + * @return an alpm_list_t* of pmdepmissing_t pointers. */ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, alpm_list_t *remove, alpm_list_t *upgrade) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 5def92a..7c8a99f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -129,6 +129,14 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, } } +/** Transaction preparation for remove actions. + * This function takes a pointer to a alpm_list_t which will be + * filled with a list of pmdepmissing_t* objects representing + * the packages blocking the transaction. + * @param trans the transaction object + * @param db the database of local packages + * @param data a pointer to an alpm_list_t* to fill + */ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) { alpm_list_t *lp; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 08856d0..309a56a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -177,8 +177,8 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs) } /** Prepare a transaction. - * @param data the address of an alpm_list where detailed description - * of an error can be dumped (ie. list of conflicting files) + * @param data the address of an alpm_list where a list + * of pmdepmissing_t objects is dumped (conflicting packages) * @return 0 on success, -1 on error (pm_errno is set accordingly) */ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data) -- 1.7.4.4

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-41-gb750d3e
by dan＠archlinux.org 09 Apr '11

09 Apr '11

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 b750d3e7b0b0d377ea856c7915f9c6acf6d512d8 (commit) via fa47dd96158563b5e6c50e637e2a12a58693dc10 (commit) via 6ebb6fec8b356c87e6fdea5659bbf34461adee90 (commit) via 3901ca1a6db773aeecb7a03271d99e87dabdfd45 (commit) via 96432ab4ef27bc6a570427736d8b7f439535e05f (commit) via 0c320b5a512b693479f2397b398f1298d7788567 (commit) via aac9e7c280a9686520e0f8f4bd7ffe4ed901716d (commit) from ff6f6027f09beaac9e387ca12f75583bba1dac21 (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 b750d3e7b0b0d377ea856c7915f9c6acf6d512d8 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Mon Mar 28 20:56:13 2011 +0200 More documentation for option getters/setters. commit fa47dd96158563b5e6c50e637e2a12a58693dc10 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Mar 6 19:11:04 2011 +0100 alpm.h: more documentation for pkgreason, depend and errno. commit 6ebb6fec8b356c87e6fdea5659bbf34461adee90 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Mar 6 19:07:25 2011 +0100 Move documentation for public package function to alpm.h commit 3901ca1a6db773aeecb7a03271d99e87dabdfd45 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Mar 6 18:51:54 2011 +0100 alpm.h: organize doxygen documentation in groups commit 96432ab4ef27bc6a570427736d8b7f439535e05f Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Mar 6 18:44:03 2011 +0100 Move documentation of public database functions to alpm.h commit 0c320b5a512b693479f2397b398f1298d7788567 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Mar 6 18:18:43 2011 +0100 alpm.h: add documentation for package property accessors commit aac9e7c280a9686520e0f8f4bd7ffe4ed901716d Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Mar 6 17:50:01 2011 +0100 Move documentation of public transaction functions to alpm.h ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 469 ++++++++++++++++++++++++++++++++++++++++++---- lib/libalpm/be_package.c | 10 - lib/libalpm/db.c | 65 ++------ lib/libalpm/dload.c | 6 +- lib/libalpm/package.c | 46 +---- lib/libalpm/trans.c | 28 +--- 6 files changed, 453 insertions(+), 171 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-34-gff6f602
by dan＠archlinux.org 09 Apr '11

09 Apr '11

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 ff6f6027f09beaac9e387ca12f75583bba1dac21 (commit) via a479e0300baf48781d145e204e11a20059ad4caa (commit) via f8882839103442787c49b8021cfd8ae2784211ad (commit) from 272e9b355b17ab663ac4a0d9515d381dcf6f03ec (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 ff6f6027f09beaac9e387ca12f75583bba1dac21 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sat Apr 9 16:04:18 2011 +0200 Fix broken documentation for alpm_trans_prepare() The current state of the code does not allow to see immediately that it returns a list of pmdepmissing_t structures. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a479e0300baf48781d145e204e11a20059ad4caa Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sat Apr 9 13:31:15 2011 +0200 libalpm: set pm_errno correctly in alpm_trans_get_flags() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f8882839103442787c49b8021cfd8ae2784211ad Author: Rémy Oudompheng <remyoudompheng(a)gmail.com> Date: Tue Apr 5 01:37:09 2011 +0200 diskspace: add the actually used statfs type in ifdefs Some systems, like FreeBSD might define both statfs and statvfs: however if statvfs exists whereas getmntinfo() uses a statfs struct, the current ifdefs would select the wrong line of code. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: acinclude.m4 | 7 +++++++ lib/libalpm/deps.c | 2 +- lib/libalpm/diskspace.c | 4 ++-- lib/libalpm/remove.c | 8 ++++++++ lib/libalpm/trans.c | 8 ++++---- 5 files changed, 22 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0