- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-383-g36c5707
by dan＠archlinux.org 07 Mar '11

07 Mar '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, master has been updated via 36c570712a34cda92ce3c3362d07baff41ba0d04 (commit) from 36df611203860eaec77f76ee76cf277b8ab87435 (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 36c570712a34cda92ce3c3362d07baff41ba0d04 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Mar 7 15:34:30 2011 -0600 Fix value of ngettext() count parameter in callback I was awesome and ran alpm_list_count() on an empty list. Fail. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/callback.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix the plural bug in the unresolvable callback function
by Nagy Gabor 07 Mar '11

07 Mar '11

Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a80172b..8a1c947 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -285,7 +285,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, { alpm_list_t *unresolved = (alpm_list_t *) data1; alpm_list_t *namelist = NULL, *i; - size_t count = alpm_list_count(namelist); + size_t count = alpm_list_count(unresolved); for (i = unresolved; i; i = i->next) { namelist = alpm_list_add(namelist, (char *)alpm_pkg_get_name(i->data)); -- 1.7.4.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-382-g36df611
by dan＠archlinux.org 07 Mar '11

07 Mar '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, master has been updated via 36df611203860eaec77f76ee76cf277b8ab87435 (commit) via 21f16fa7ab64cf4b596f16eac3ed9f0a1edc4110 (commit) via f2023176f6177fd9f2f3b7c8b2a5288f485892f7 (commit) from 0b6aa428cf06e9e23ac4d912f8f6eba2330af226 (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 36df611203860eaec77f76ee76cf277b8ab87435 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 1 14:20:24 2011 +1000 Update NEWS for pacman-3.5 release Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 21f16fa7ab64cf4b596f16eac3ed9f0a1edc4110 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 27 23:33:43 2011 +1000 Document API changes for pacman-3.5 release Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f2023176f6177fd9f2f3b7c8b2a5288f485892f7 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 6 17:45:33 2011 +1000 Do not print warning with files entry in sync db repo-add can add a "files" entry into the sync db. Currently we do nothing with this file, so explicitly skip it to prevent unknown database file warnings. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++ README | 37 +++++++++++++++++++++++++++++++++++++ lib/libalpm/be_sync.c | 6 ++++-- 3 files changed, 85 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Do not print warning with files entry in sync db
by Allan McRae 06 Mar '11

06 Mar '11

repo-add can add a "files" entry into the sync db. Currently we do nothing with this file, so explicitly skip it to prevent unknown database file warnings. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5faf0b8..6c0d2d6 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -432,9 +432,11 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, READ_AND_STORE_ALL(pkg->deltas); } } + } else if(strcmp(filename, "files") == 0) { + /* currently do nothing with this file */ } else { - /* unknown database file */ - _alpm_log(PM_LOG_DEBUG, "unknown database file: %s", filename); + /* unknown database file */ + _alpm_log(PM_LOG_DEBUG, "unknown database file: %s\n", filename); } error: -- 1.7.4.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.3-379-g0b6aa42
by dan＠archlinux.org 03 Mar '11

03 Mar '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 0b6aa428cf06e9e23ac4d912f8f6eba2330af226 (commit) via 79f8cfb529f8bc13a239548cf513db100739555b (commit) from d68635e7c2bc38343a58a8f9cddf95960fa642be (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/diskspace.c | 2 +- lib/libalpm/po/Makevars | 2 +- lib/libalpm/po/libalpm.pot | 4 ++-- po/Makevars | 2 +- po/pacman.pot | 31 ++++++++++++++++++++++++++++++- 5 files changed, 35 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-379-g0b6aa42
by dan＠archlinux.org 03 Mar '11

03 Mar '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, master has been updated via 0b6aa428cf06e9e23ac4d912f8f6eba2330af226 (commit) via 79f8cfb529f8bc13a239548cf513db100739555b (commit) from d68635e7c2bc38343a58a8f9cddf95960fa642be (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 0b6aa428cf06e9e23ac4d912f8f6eba2330af226 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 3 11:10:09 2011 -0600 Fix gettext plural detection Our keywords were all screwed up in this regard. Fix it so our ngettext() shortcut calls are actually recognized and respected. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 79f8cfb529f8bc13a239548cf513db100739555b Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Mar 2 00:06:33 2011 +0100 libalpm/diskspace.c: remove bogus parenthesis Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/diskspace.c | 2 +- lib/libalpm/po/Makevars | 2 +- lib/libalpm/po/libalpm.pot | 4 ++-- po/Makevars | 2 +- po/pacman.pot | 31 ++++++++++++++++++++++++++++++- 5 files changed, 35 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] alpm.h: add Doxygen-style doc to package-related functions.
by Rémy Oudompheng 02 Mar '11

02 Mar '11

--- lib/libalpm/alpm.h | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 167 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 0f3b716..7fa27d8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -199,36 +199,203 @@ int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason); /* Info parameters */ +/** Create a package from a file. + * If full is false, the archive is read only until all necessary + * metadata is found. If it is true, the entire archive is read, which + * serves as a verfication of integrity and the filelist can be created. + * @param filename location of the package tarball + * @param full whether to stop the load after metadata is read or continue + * through the full archive + * @param pkg address of the package pointer + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ int alpm_pkg_load(const char *filename, int full, pmpkg_t **pkg); + +/** Free a package. + * @param pkg package pointer to free + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ int alpm_pkg_free(pmpkg_t *pkg); + +/** Check the integrity (with md5) of a package from the sync cache. + * @param pkg package pointer + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ int alpm_pkg_checkmd5sum(pmpkg_t *pkg); char *alpm_fetch_pkgurl(const char *url); int alpm_pkg_vercmp(const char *a, const char *b); alpm_list_t *alpm_pkg_compute_requiredby(pmpkg_t *pkg); +/** + * Package property accessors + * + * These functions return pointers to internal structures allocated by + * libalpm. They should not be freed. + */ + +/** + * @brief Gets the name of the file from which the package was loaded. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_filename(pmpkg_t *pkg); + +/** + * @brief Returns the package name. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_name(pmpkg_t *pkg); + +/** + * @brief Returns the package version as a string. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_version(pmpkg_t *pkg); + +/** + * @brief Returns the package description. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_desc(pmpkg_t *pkg); + +/** + * @brief Returns the package URL. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_url(pmpkg_t *pkg); + +/** + * @brief Returns the build timestamp of the package. + * @param pkg a pointer to package + * @return the timestamp of the build time + */ time_t alpm_pkg_get_builddate(pmpkg_t *pkg); + +/** + * @brief Returns the install timestamp of the package. + * @param pkg a pointer to package + * @return the timestamp of the install time + */ time_t alpm_pkg_get_installdate(pmpkg_t *pkg); + +/** + * @brief Returns the packager's name. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_packager(pmpkg_t *pkg); + +/** + * @brief Returns the package md5sum as a string of hexadecimal digits. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_md5sum(pmpkg_t *pkg); + +/** + * @brief Returns the architecture for which the package was built. + * @param pkg a pointer to package + * @return a reference to an internal string + */ const char *alpm_pkg_get_arch(pmpkg_t *pkg); + +/** + * @brief Returns the size of the package + * @param pkg a pointer to package + * @return the size of the package in bytes. + */ off_t alpm_pkg_get_size(pmpkg_t *pkg); + +/** + * @brief Returns the installed size of the package + * @param pkg a pointer to package + * @return the total size of files installed by the package. + */ off_t alpm_pkg_get_isize(pmpkg_t *pkg); + +/** + * @brief Returns the package installation reason. + * @param pkg a pointer to package + * @return a pmpkgreason_t member giving the install reason. + */ pmpkgreason_t alpm_pkg_get_reason(pmpkg_t *pkg); + +/** + * @brief Returns the list of package licenses. + * @param pkg a pointer to package + * @return a pointer to an internal list of strings. + */ alpm_list_t *alpm_pkg_get_licenses(pmpkg_t *pkg); + +/** + * @brief Returns the list of package groups. + * @param pkg a pointer to package + * @return a pointer to an internal list of strings. + */ alpm_list_t *alpm_pkg_get_groups(pmpkg_t *pkg); + +/** + * @brief Returns the list of package dependencies as pmdepend_t. + * @param pkg a pointer to package + * @return a reference to an internal list of pmdepend_t structures. + */ alpm_list_t *alpm_pkg_get_depends(pmpkg_t *pkg); + +/** + * @brief Returns the list of package optional dependencies. + * @param pkg a pointer to package + * @return a reference to an internal list of strings. + */ alpm_list_t *alpm_pkg_get_optdepends(pmpkg_t *pkg); + +/** + * @brief Returns the list of package names conflicting with pkg. + * @param pkg a pointer to package + * @return a reference to an internal list of strings. + */ alpm_list_t *alpm_pkg_get_conflicts(pmpkg_t *pkg); + +/** + * @brief Returns the list of package names provided by pkg. + * @param pkg a pointer to package + * @return a reference to an internal list of strings. + */ alpm_list_t *alpm_pkg_get_provides(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg); + +/** + * @brief Returns the list of packages to be replaced by pkg. + * @param pkg a pointer to package + * @return a reference to an internal list of strings. + */ alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg); + +/** + * @brief Returns the list of files installed by pkg. + * @param pkg a pointer to package + * @return a reference to an internal list of filenames. + */ alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg); + +/** + * @brief Returns the list of files backed up when installing pkg. + * @param pkg a pointer to package + * @return a reference to an internal list of filenames. + */ alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg); + +/** + * @brief Returns the pmdb_t containing pkg + * + * Returns a pointer to the pmdb_t structure the package is + * originating from, or NULL is the package was loaded from a file. + * @param pkg a pointer to package + * @return a pointer to the DB containing pkg, or NULL. + */ pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg); void *alpm_pkg_changelog_open(pmpkg_t *pkg); size_t alpm_pkg_changelog_read(void *ptr, size_t size, -- 1.7.4.1

3 3

[pacman-dev] [PATCH 3/3] alpm.h: use Doxygen-style grouping in documentation
by Rémy Oudompheng 02 Mar '11

02 Mar '11

--- lib/libalpm/alpm.h | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 14a2782..0011bb3 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -39,6 +39,13 @@ extern "C" { * Arch Linux Package Management library */ +/** + * @addtogroup libalpm Public API + * + * @brief The libalpm Public API + * @{ + */ + /* * Structures */ @@ -93,8 +100,10 @@ typedef void (*alpm_cb_totaldl)(off_t total); typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, int force); -/* - * Options +/** + * @addtogroup alpm_options Options + * @{ + * @brief Libalpm option getters and setters */ alpm_cb_log alpm_option_get_logcb(void); @@ -158,6 +167,8 @@ void alpm_option_set_usedelta(int usedelta); int alpm_option_get_checkspace(void); void alpm_option_set_checkspace(int checkspace); +/** @} */ + pmdb_t *alpm_option_get_localdb(void); alpm_list_t *alpm_option_get_syncdbs(void); @@ -193,8 +204,10 @@ alpm_list_t *alpm_db_get_grpcache(pmdb_t *db); alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason); -/* - * Packages +/** + * @addtogroup alpm_packages Package functions + * @{ + * @brief Packages */ /* Info parameters */ @@ -407,6 +420,9 @@ int alpm_pkg_has_scriptlet(pmpkg_t *pkg); off_t alpm_pkg_download_size(pmpkg_t *newpkg); alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg); +/* endgroup alpm_packages */ +/** @} */ + /* * Deltas */ @@ -430,12 +446,13 @@ alpm_list_t *alpm_find_grp_pkgs(alpm_list_t *dbs, const char *name); pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync); -/* - * Transactions +/** + * @addtogroup alpm_trans Transactions + * @{ + * @brief Transaction-related enums and functions */ - -/* Flags */ +/** Transaction flags */ typedef enum _pmtransflag_t { PM_TRANS_FLAG_NODEPS = 1, PM_TRANS_FLAG_FORCE = (1 << 1), @@ -458,10 +475,6 @@ typedef enum _pmtransflag_t { } pmtransflag_t; /** - * @addtogroup alpm_trans - * @{ - */ -/** * @brief Transaction events. * NULL parameters are passed to in all events unless specified otherwise. */ @@ -541,7 +554,6 @@ typedef enum _pmtransevt_t { /** Disk space usage was computed for a package */ PM_TRANS_EVT_DISKSPACE_DONE, } pmtransevt_t; -/*@}*/ /* Transaction Conversations (ie, questions) */ typedef enum _pmtransconv_t { @@ -584,13 +596,18 @@ int alpm_trans_prepare(alpm_list_t **data); int alpm_trans_commit(alpm_list_t **data); int alpm_trans_interrupt(void); int alpm_trans_release(void); +/*@}*/ int alpm_sync_sysupgrade(int enable_downgrade); int alpm_add_pkg(pmpkg_t *pkg); int alpm_remove_pkg(pmpkg_t *pkg); -/* - * Dependencies and conflicts +/** + * @addtogroup alpm_depends Dependency and conflict information + * @{ + * + * @brief Helper functions to manage dependency information + * structures */ /** @brief Types of version constraints in dependency specs. */ @@ -656,6 +673,8 @@ const char *alpm_dep_get_version(const pmdepend_t *dep); */ char *alpm_dep_compute_string(const pmdepend_t *dep); +// @} + /* * File conflicts */ @@ -744,6 +763,8 @@ extern enum _pmerrno_t pm_errno; const char *alpm_strerror(int err); const char *alpm_strerrorlast(void); +/** @} */ + #ifdef __cplusplus } #endif -- 1.7.4.1

2 1

[pacman-dev] [PATCH 2/3] alpm.h: add Doxygen-style doc for pmdepend_t, pmdepmod_t.
by Rémy Oudompheng 02 Mar '11

02 Mar '11

--- lib/libalpm/alpm.h | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7fa27d8..14a2782 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -593,12 +593,19 @@ int alpm_remove_pkg(pmpkg_t *pkg); * Dependencies and conflicts */ +/** @brief Types of version constraints in dependency specs. */ typedef enum _pmdepmod_t { + /** No version constraint */ PM_DEP_MOD_ANY = 1, + /** Test version equality (package=x.y.z) */ PM_DEP_MOD_EQ, + /** Test for at least a version (package>=x.y.z) */ PM_DEP_MOD_GE, + /** Test for at most a version (package<=x.y.z) */ PM_DEP_MOD_LE, + /** Test for greater than some version (package>x.y.z) */ PM_DEP_MOD_GT, + /** Test for less than some version (package<x.y.z) */ PM_DEP_MOD_LT } pmdepmod_t; @@ -617,9 +624,36 @@ const char *alpm_conflict_get_package1(pmconflict_t *conflict); const char *alpm_conflict_get_package2(pmconflict_t *conflict); const char *alpm_conflict_get_reason(pmconflict_t *conflict); +/** + * @brief Returns the type of version constraint. + * @param dep a dependency info structure + * @return the type of version constraint. + */ pmdepmod_t alpm_dep_get_mod(const pmdepend_t *dep); + +/** + * @brief Returns the package name of a dependency constraint. + * @param dep a dependency info structure + * @return a pointer to an internal string. + */ const char *alpm_dep_get_name(const pmdepend_t *dep); + +/** + * @brief Returns the version specified by a dependency constraint. + * + * The version information is stored as a string of the form + * "1.2.3-4". + * @param dep a dependency info structure + * @return a pointer to an internal string. + */ const char *alpm_dep_get_version(const pmdepend_t *dep); + +/** + * Returns a newly allocated string representing the dependency + * information. + * @param dep a dependency info structure + * @return a formatted string, e.g. "glibc>=2.12" + */ char *alpm_dep_compute_string(const pmdepend_t *dep); /* -- 1.7.4.1

2 1

[pacman-dev] [PATCH] alpm: improve installing messages on warning/errors
by Boris 'billiob' Faure 01 Mar '11

01 Mar '11

Hi, I have attached a patch to change a little bit what messages are printed when creating a ".pacnew" file. Regards -- Boris 'billiob' Faure

3 4