- Pacman-dev - lists.archlinux.org

[pacman-dev] Why alpm_parse_config have been dropped from libalpm 2.0?
by Stefano Esposito 03 Sep '07

03 Sep '07

Just wandering why such a useful function have been dropped from libalpm and moved in pacman itself. -- Stefano Esposito <stefano.esposito87(a)gmail.com>

2 1

[pacman-dev] alpm linking
by Stefano Esposito 03 Sep '07

03 Sep '07

Hi all, just trying to compile a trivial c++ program which uses alpm. In the linking phase i get those errors: alpmm.o: In function `alpm_str_list_to_vector(__alpm_list_t*)': alpmm.cc:(.text+0x1b2): undefined reference to `alpm_list_first(__alpm_list_t*)' alpmm.cc:(.text+0x1d0): undefined reference to `alpm_list_getdata(__alpm_list_t const*)' alpmm.cc:(.text+0x24b): undefined reference to `alpm_list_next(__alpm_list_t*)' alpmm.o: In function `Alpmm::set_databases()': alpmm.cc:(.text+0x5c2): undefined reference to `alpm_list_getdata(__alpm_list_t const*)' alpmm.cc:(.text+0x6fc): undefined reference to `alpm_list_next(__alpm_list_t*)' alpmm.o: In function `Alpmm::get_options()': alpmm.cc:(.text+0x788): undefined reference to `alpm_option_get_logfile' alpmm.cc:(.text+0x79f): undefined reference to `alpm_option_get_usesyslog' alpmm.cc:(.text+0x7be): undefined reference to `alpm_option_get_noupgrades' alpmm.cc:(.text+0x7f5): undefined reference to `alpm_option_get_noextracts' alpmm.cc:(.text+0x84d): undefined reference to `alpm_option_get_ignorepkgs' alpmm.cc:(.text+0x8a5): undefined reference to `alpm_option_get_holdpkgs' alpmm.cc:(.text+0x8fd): undefined reference to `alpm_option_get_needles' database.o: In function `~Database': /home/ragnarok/workspace/gtkpacman/branches/c++/src/database.cc:26: undefined reference to `alpm_db_unregister' /home/ragnarok/workspace/gtkpacman/branches/c++/src/database.cc:26: undefined reference to `alpm_db_unregister' database.o: In function `Database::get_packages()': /home/ragnarok/workspace/gtkpacman/branches/c++/src/database.cc:45: undefined reference to `alpm_list_next(__alpm_list_t*)' /home/ragnarok/workspace/gtkpacman/branches/c++/src/database.cc:47: undefined reference to `alpm_list_getdata(__alpm_list_t const*)' I'm just missing something on alpm linking? I've added only -lalpm to my compiler line -- Stefano Esposito -- Stefano Esposito <stefano.esposito87(a)gmail.com>

2 1

[pacman-dev] [PATCH] Update German translation
by Matthias Gorissen 01 Sep '07

01 Sep '07

No warranties, but in the hope to be useful ... Best regards, Matt

2 2

[pacman-dev] File extract bug in makepkg
by Nagy Gabor 30 Aug '07

30 Aug '07

Hi! If the source file can be found in the directory of PKGBUILD, makepkg creates a symlink in the 'pkg' subdir pointing to the source file (e.g. pkg/src.tar.gz -> ../src.tar.gz) instead of extracting it. This seems to be a bug. Bye PS: Sorry, if this issue was reported earlier, I don't follow makepkg threads in this channel/FS. ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] new Ukrainian mirror
by Roman Kyrylych 29 Aug '07

29 Aug '07

Hi! Now we have 2nd mirror in Ukraine, now it includes x86_64 packages and up-to-date ISOs. Please add ftp://hell.org.ua/archlinux/ to pacman's mirrorlist. -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] [patch] updated Hungarian translation
by Nagy Gabor 28 Aug '07

28 Aug '07

Hi! hu.po attached. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

1 0

[pacman-dev] pacman snapshot
by Nagy Gabor 28 Aug '07

28 Aug '07

Hi! It would be helpful, if we could download the latest pacman snapshot. I usually use Andrew's snapshot but now that is outdated. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 4

[pacman-dev] crappy version of -Qu (query upgrades)
by Xavier 27 Aug '07

27 Aug '07

See http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=63000584b6442412… TODO: move the implementation to upgrades.c, and reimplement the sync_sysupgrade function in terms of this: trans->packages = alpm_get_upgrades(); I took a slightly different approach : change sync_sysupgrade slightly to also return a list of sync packages. So sync_sysupgrade might still ask questions to the user, but this can be disabled by passing a NULL trans argument. In case trans is not null, sync_sysupgrade will set trans->packages to the list of upgrades. In both cases, it'll return the list of upgrades. >From ddbfb04293e28738d859da53ad09192889afbb6d Mon Sep 17 00:00:00 2001 From: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat, 25 Aug 2007 00:10:40 +0200 Subject: [PATCH] Remove duplicated get_upgrades function, use sysupgrade instead. The alpm_get_upgrades was exactly the same as _alpm_sync_sysupgrade, except that it didn't ask for confirmation. There are two kind of questions asked : %s is in IgnorePkg. Install anyway? [Y/n] Replace %s with %s/%s? [Y/n] The first question was actually never asked, because alpm_pkg_compare_versions already ignored the packages in IgnorePkg. I removed the IgnorePkg handling from alpm_pkg_compare_versions, but kept the same behavior with _alpm_sync_sysupgrade, that is ignore packages automatically, without confirmation. The replace question is asked in _alpm_find_replacements. This question can be skipped by using a NULL trans argument, so that we get the same behavior as with alpm_get_upgrades. alpm_db_get_upgrades() can now be replaced by : alpm_sync_sysupgrade(NULL, db_local, syncdbs). Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/alpm.h | 3 +- lib/libalpm/db.c | 141 -------------------------------- lib/libalpm/package.c | 10 --- lib/libalpm/sync.c | 213 +++++++++++++++++++++++++++---------------------- lib/libalpm/sync.h | 1 - lib/libalpm/trans.c | 3 +- src/pacman/query.c | 4 +- 7 files changed, 124 insertions(+), 251 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 844d9bf..62de9a1 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -163,8 +163,6 @@ alpm_list_t *alpm_db_getgrpcache(pmdb_t *db); alpm_list_t *alpm_db_test(pmdb_t *db); alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); -alpm_list_t *alpm_db_get_upgrades(void); - /* * Packages */ @@ -237,6 +235,7 @@ typedef enum _pmsynctype_t { pmsynctype_t alpm_sync_get_type(const pmsyncpkg_t *sync); pmpkg_t *alpm_sync_get_pkg(const pmsyncpkg_t *sync); void *alpm_sync_get_data(const pmsyncpkg_t *sync); +alpm_list_t *alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync); /* * Transactions diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0cb375d..0da935e 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -46,8 +46,6 @@ #include "cache.h" #include "alpm.h" -#include "sync.h" /* alpm_db_get_upgrades() */ - /** \addtogroup alpm_databases Database Functions * @brief Functions to query and manipulate the database of libalpm * @{ @@ -440,145 +438,6 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) return(_alpm_db_search(db, needles)); } -/* This function is mostly the same as sync.c find_replacements and sysupgrade - * functions, and we should be able to combine them - this is an interim - * solution made for -Qu operation */ -/** Get a list of upgradable packages on the current system - * @return a pmsyncpkg_t list of packages that are out of date - */ -alpm_list_t SYMEXPORT *alpm_db_get_upgrades(void) -{ - alpm_list_t *syncpkgs = NULL; - const alpm_list_t *i, *j, *k, *m; - - ALPM_LOG_FUNC; - - /* TODO holy nested loops, Batman! */ - /* check for "recommended" package replacements */ - _alpm_log(PM_LOG_DEBUG, "checking for package replacements"); - for(i = handle->dbs_sync; i; i = i->next) { - for(j = _alpm_db_get_pkgcache(i->data); j; j = j->next) { - pmpkg_t *spkg = j->data; - - for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) { - - for(m = _alpm_db_get_pkgcache(handle->db_local); m; m = m->next) { - pmpkg_t *lpkg = m->data; - - if(strcmp(k->data, alpm_pkg_get_name(lpkg)) == 0) { - _alpm_log(PM_LOG_DEBUG, "checking replacement '%s' for package '%s'", - k->data, alpm_pkg_get_name(spkg)); - if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(lpkg))) { - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), - alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - } else { - /* assume all replaces=() packages are accepted */ - pmsyncpkg_t *sync = NULL; - pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(lpkg), NULL); - if(dummy == NULL) { - pm_errno = PM_ERR_MEMORY; - goto error; - } - dummy->requiredby = alpm_list_strdup(alpm_pkg_get_requiredby(lpkg)); - - pmsyncpkg_t *syncpkg; - syncpkg = _alpm_sync_find(syncpkgs, alpm_pkg_get_name(spkg)); - - if(syncpkg) { - /* found it -- just append to the replaces list */ - sync->data = alpm_list_add(sync->data, dummy); - } else { - /* none found -- enter pkg into the final sync list */ - sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL); - if(sync == NULL) { - _alpm_pkg_free(dummy); - pm_errno = PM_ERR_MEMORY; - goto error; - } - sync->data = alpm_list_add(NULL, dummy); - syncpkgs = alpm_list_add(syncpkgs, sync); - } - _alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)", - alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - } - break; - } - } - } - } - } - - /* now do normal upgrades */ - for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { - int replace=0; - pmpkg_t *local = i->data; - pmpkg_t *spkg = NULL; - pmsyncpkg_t *sync; - - for(j = handle->dbs_sync; !spkg && j; j = j->next) { - spkg = _alpm_db_get_pkgfromcache(j->data, alpm_pkg_get_name(local)); - } - if(spkg == NULL) { - _alpm_log(PM_LOG_DEBUG, "'%s' not found in sync db -- skipping", - alpm_pkg_get_name(local)); - continue; - } - - /* we don't care about a to-be-replaced package's newer version */ - for(j = syncpkgs; j && !replace; j=j->next) { - sync = j->data; - if(sync->type == PM_SYNC_TYPE_REPLACE) { - if(_alpm_pkg_find(alpm_pkg_get_name(spkg), sync->data)) { - replace=1; - } - } - } - if(replace) { - _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping", - alpm_pkg_get_name(local)); - continue; - } - - if(alpm_pkg_compare_versions(local, spkg)) { - _alpm_log(PM_LOG_DEBUG, "%s elected for upgrade (%s => %s)", - alpm_pkg_get_name(local), alpm_pkg_get_version(local), - alpm_pkg_get_version(spkg)); - - pmsyncpkg_t *syncpkg; - syncpkg = _alpm_sync_find(syncpkgs, alpm_pkg_get_name(local)); - - if(!syncpkg) { - pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local), - alpm_pkg_get_version(local)); - if(dummy == NULL) { - goto error; - } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); - if(sync == NULL) { - _alpm_pkg_free(dummy); - goto error; - } - syncpkgs = alpm_list_add(syncpkgs, sync); - } - } - } - - return(syncpkgs); -error: - if(syncpkgs) { - alpm_list_t *tmp; - for(tmp = syncpkgs; tmp; tmp = alpm_list_next(tmp)) { - if(tmp->data) { - _alpm_sync_free(tmp->data); - } - } - alpm_list_free(syncpkgs); - } - return(NULL); -} - /** @} */ pmdb_t *_alpm_db_new(const char *dbpath, const char *treename) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 86c19d3..b630102 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -727,16 +727,6 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) /* compare versions and see if we need to upgrade */ cmp = _alpm_versioncmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg)); - if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) { - /* package should be ignored (IgnorePkg) */ - if(cmp > 0) { - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), - alpm_pkg_get_version(pkg)); - } - return(0); - } - if(cmp != 0 && pkg->force) { cmp = 1; _alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s"), diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8aabcdb..edb406f 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -90,13 +90,27 @@ void _alpm_sync_free(pmsyncpkg_t *sync) FREE(sync); } +void _alpm_synclist_free(alpm_list_t *syncpkgs) +{ + if(syncpkgs) { + alpm_list_t *tmp; + for(tmp = syncpkgs; tmp; tmp = alpm_list_next(tmp)) { + if(tmp->data) { + _alpm_sync_free(tmp->data); + } + } + alpm_list_free(syncpkgs); + } + +} + /* Find recommended replacements for packages during a sync. - * (refactored from _alpm_sync_prepare) */ -static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, +static alpm_list_t *_alpm_find_replacements(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) { alpm_list_t *i, *j, *k; /* wow */ + alpm_list_t *syncpkgs = NULL; ALPM_LOG_FUNC; @@ -127,124 +141,133 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); } else { /* get confirmation for the replacement */ - int doreplace = 0; - QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace); + if(trans) { + int doreplace = 0; + QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace); + if(!doreplace) { + continue; + } + } - if(doreplace) { - /* if confirmed, add this to the 'final' list, designating 'lpkg' as - * the package to replace. - */ - pmsyncpkg_t *sync; - pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(lpkg), NULL); - if(dummy == NULL) { + /* if confirmed, add this to the 'final' list, designating 'lpkg' as + * the package to replace. + */ + pmsyncpkg_t *sync; + pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(lpkg), NULL); + if(dummy == NULL) { + pm_errno = PM_ERR_MEMORY; + _alpm_synclist_free(syncpkgs); + return(NULL); + } + dummy->requiredby = alpm_list_strdup(alpm_pkg_get_requiredby(lpkg)); + /* check if spkg->name is already in the packages list. */ + sync = _alpm_sync_find(syncpkgs, alpm_pkg_get_name(spkg)); + if(sync) { + /* found it -- just append to the replaces list */ + sync->data = alpm_list_add(sync->data, dummy); + } else { + /* none found -- enter pkg into the final sync list */ + sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL); + if(sync == NULL) { + _alpm_pkg_free(dummy); pm_errno = PM_ERR_MEMORY; - goto error; + _alpm_synclist_free(syncpkgs); + return(NULL); } - dummy->requiredby = alpm_list_strdup(alpm_pkg_get_requiredby(lpkg)); - /* check if spkg->name is already in the packages list. */ - sync = _alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg)); - if(sync) { - /* found it -- just append to the replaces list */ - sync->data = alpm_list_add(sync->data, dummy); - } else { - /* none found -- enter pkg into the final sync list */ - sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL); - if(sync == NULL) { - _alpm_pkg_free(dummy); - pm_errno = PM_ERR_MEMORY; - goto error; - } - sync->data = alpm_list_add(NULL, dummy); - trans->packages = alpm_list_add(trans->packages, sync); - } - _alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)", - alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); + sync->data = alpm_list_add(NULL, dummy); + syncpkgs = alpm_list_add(syncpkgs, sync); } + _alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)", + alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), + alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); } } } } - return(0); -error: - return(-1); + return(syncpkgs); } -/* TODO reimplement this in terms of alpm_get_upgrades */ -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) +/** Get a list of upgradable packages on the current system + * @return a pmsyncpkg_t list of packages that are out of date + */ +alpm_list_t SYMEXPORT *alpm_sync_sysupgrade(pmtrans_t *trans, + pmdb_t *db_local, alpm_list_t *dbs_sync) { + alpm_list_t *syncpkgs = NULL; alpm_list_t *i, *j; ALPM_LOG_FUNC; /* check for "recommended" package replacements */ - if(find_replacements(trans, db_local, dbs_sync) == 0) { - /* match installed packages with the sync dbs and compare versions */ - _alpm_log(PM_LOG_DEBUG, "checking for package upgrades"); - for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { - int replace=0; - pmpkg_t *local = i->data; - pmpkg_t *spkg = NULL; - pmsyncpkg_t *sync; - - for(j = dbs_sync; !spkg && j; j = j->next) { - spkg = _alpm_db_get_pkgfromcache(j->data, alpm_pkg_get_name(local)); - } - if(spkg == NULL) { - _alpm_log(PM_LOG_DEBUG, "'%s' not found in sync db -- skipping", - alpm_pkg_get_name(local)); - continue; - } + syncpkgs = _alpm_find_replacements(trans, db_local, dbs_sync); + + /* match installed packages with the sync dbs and compare versions */ + _alpm_log(PM_LOG_DEBUG, "checking for package upgrades"); + for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { + int replace=0; + pmpkg_t *local = i->data; + pmpkg_t *spkg = NULL; + pmsyncpkg_t *sync; + + for(j = dbs_sync; !spkg && j; j = j->next) { + spkg = _alpm_db_get_pkgfromcache(j->data, alpm_pkg_get_name(local)); + } + if(spkg == NULL) { + _alpm_log(PM_LOG_DEBUG, "'%s' not found in sync db -- skipping", + alpm_pkg_get_name(local)); + continue; + } - /* we don't care about a to-be-replaced package's newer version */ - for(j = trans->packages; j && !replace; j=j->next) { - sync = j->data; - if(sync->type == PM_SYNC_TYPE_REPLACE) { - if(_alpm_pkg_find(alpm_pkg_get_name(spkg), sync->data)) { - replace=1; - } + /* we don't care about a to-be-replaced package's newer version */ + for(j = syncpkgs; j && !replace; j=j->next) { + sync = j->data; + if(sync->type == PM_SYNC_TYPE_REPLACE) { + if(_alpm_pkg_find(alpm_pkg_get_name(spkg), sync->data)) { + replace=1; } } - if(replace) { - _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping", - alpm_pkg_get_name(local)); - continue; - } + } + if(replace) { + _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping", + alpm_pkg_get_name(local)); + continue; + } - /* compare versions and see if we need to upgrade */ - if(alpm_pkg_compare_versions(local, spkg)) { - _alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (%s => %s)", - alpm_pkg_get_name(local), alpm_pkg_get_version(local), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) { - /* If package is in the ignorepkg list, ask before we add it to - * the transaction */ - if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) { - int resp = 0; - QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp); - if(!resp) { - continue; - } - } - pmpkg_t *tmp = _alpm_pkg_dup(local); - if(tmp == NULL) { - goto error; - } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp); - if(sync == NULL) { - _alpm_pkg_free(tmp); - goto error; - } - trans->packages = alpm_list_add(trans->packages, sync); + /* compare versions and see if we need to upgrade */ + if(alpm_pkg_compare_versions(local, spkg)) { + _alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (%s => %s)", + alpm_pkg_get_name(local), alpm_pkg_get_version(local), + alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); + if(!_alpm_sync_find(syncpkgs, alpm_pkg_get_name(spkg))) { + /* If package is in the ignorepkg list, skip it */ + if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) { + _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local), + alpm_pkg_get_version(spkg)); + continue; + } + + pmpkg_t *tmp = _alpm_pkg_dup(local); + if(tmp == NULL) { + _alpm_synclist_free(syncpkgs); + return(NULL); + } + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp); + if(sync == NULL) { + _alpm_pkg_free(tmp); + _alpm_synclist_free(syncpkgs); + return(NULL); } + syncpkgs = alpm_list_add(syncpkgs, sync); } } + } - return(0); + if(trans) { + trans->packages = syncpkgs; } -error: - /* if we're here, it's an error */ - return(-1); + + return(syncpkgs); } int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name) diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index ef094b5..0d91d25 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -35,7 +35,6 @@ struct __pmsyncpkg_t { pmsyncpkg_t *_alpm_sync_new(int type, pmpkg_t *spkg, void *data); void _alpm_sync_free(pmsyncpkg_t *data); -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync); int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name); int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data); int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 5382014..c0d4b3d 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -292,7 +292,8 @@ int _alpm_trans_sysupgrade(pmtrans_t *trans) /* Sanity checks */ ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); - return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync)); + alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync); + return(0); } /** Add a target to the transaction. diff --git a/src/pacman/query.c b/src/pacman/query.c index 8ef47e6..7849e84 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -239,7 +239,9 @@ static int query_upgrades(void) printf(_("Checking for package upgrades... \n")); alpm_list_t *syncpkgs; - if((syncpkgs = alpm_db_get_upgrades()) != NULL) { + alpm_list_t *syncdbs = alpm_option_get_syncdbs(); + if((syncpkgs = alpm_sync_sysupgrade(NULL, + db_local, syncdbs)) != NULL) { display_targets(syncpkgs); return(0); } -- 1.5.2.5

2 5

[pacman-dev] [PATCH] Quick and dirty change to move sync repos.
by Travis Willard 27 Aug '07

27 Aug '07

Here's the quick-and-dirty version of moving repos to $DBPATH/sync/$REPO. I don't much like it, to be honest - I'd prefer to separate the concept of the local repo from the sync repos entirely, but that would break the current interface into libalpm, as alpm_db_register("local") would, ideally, register a sync repo named "local", and we'd have to add another method like alpm_localdb_register() or something of that sort to register the local database. I could do the less-dirty fix, but I quite imagine the current API is supposed to remain decently stable, so here's one that works with the current setup. From 552b39f5dafdf4e1104ee7f4876f6a1a7115a736 Mon Sep 17 00:00:00 2001 From: Travis Willard <travis(a)archlinux.org> Date: Fri, 24 Aug 2007 22:28:15 -0400 Subject: [PATCH] Quick and dirty change to move sync repos. This is a quick-n-dirty fix to place all sync repos into the $DBPATH/sync/$REPO path instead of the previous $DBPATH/$REPO - this differentiates sync repos from local repos structurally. Signed-off-by: Travis Willard <travis(a)archlinux.org> --- lib/libalpm/db.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0cb375d..6bc85b7 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -695,7 +695,9 @@ pmdb_t *_alpm_db_register(const char *treename) struct stat buf; pmdb_t *db; const char *dbpath; + char real_dbpath[PATH_MAX]; char path[PATH_MAX]; + char local; ALPM_LOG_FUNC; @@ -704,6 +706,7 @@ pmdb_t *_alpm_db_register(const char *treename) _alpm_log(PM_LOG_WARNING, _("attempt to re-register the 'local' DB")); RET_ERR(PM_ERR_DB_NOT_NULL, NULL); } + local = 1; } else { alpm_list_t *i; for(i = handle->dbs_sync; i; i = i->next) { @@ -713,6 +716,7 @@ pmdb_t *_alpm_db_register(const char *treename) return sdb; } } + local = 0; } _alpm_log(PM_LOG_DEBUG, "registering database '%s'", treename); @@ -723,7 +727,8 @@ pmdb_t *_alpm_db_register(const char *treename) _alpm_log(PM_LOG_WARNING, _("database path is undefined")); RET_ERR(PM_ERR_DB_OPEN, NULL); } - snprintf(path, PATH_MAX, "%s%s", dbpath, treename); + snprintf(real_dbpath, PATH_MAX, "%s%s", dbpath, local? "":"sync/"); + snprintf(path, PATH_MAX, "%s%s", real_dbpath, treename); /* TODO this is rediculous, we try to do this even if we can't */ if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it", @@ -733,7 +738,7 @@ pmdb_t *_alpm_db_register(const char *treename) } } - db = _alpm_db_new(dbpath, treename); + db = _alpm_db_new(real_dbpath, treename); if(db == NULL) { RET_ERR(PM_ERR_DB_CREATE, NULL); } @@ -744,7 +749,7 @@ pmdb_t *_alpm_db_register(const char *treename) RET_ERR(PM_ERR_DB_OPEN, NULL); } - if(strcmp(treename, "local") == 0) { + if(local) { handle->db_local = db; } else { handle->dbs_sync = alpm_list_add(handle->dbs_sync, db); -- 1.5.2.5

3 4

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-365-g26441cf
by Dan McGee 27 Aug '07

27 Aug '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 26441cf65ca10d4bf218203df5db5e8a7270787b (commit) via c8011954a5fc3d838bc2fc72ed03da4506a695e1 (commit) via 3e418a15341e51a9ca3ac61c4b134682235f6a9c (commit) via 5c9eec5570c145c07660bd2ba207b579eda0f26c (commit) via 2798ebbb6286b7a0acc4b5ff10906c1a92ecc946 (commit) via 656c895ca4a169ec933419ab9cea1897f08799e8 (commit) via 10c3f335d00a38429ce51d2ebcc636083a71d050 (commit) from e24bcc395e7da2a4f46933ea342d0ce90b708de4 (commit) - Log ----------------------------------------------------------------- commit 26441cf65ca10d4bf218203df5db5e8a7270787b Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Aug 25 16:26:41 2007 +0200 libalpm/add.c : fix backup handling. During last refactoring, a "continue" somehow became a "return(0)" :) Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit c8011954a5fc3d838bc2fc72ed03da4506a695e1 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Aug 24 11:47:40 2007 +0200 pacman/sync.c : kill extra newline with groups on -Ss operation. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 3e418a15341e51a9ca3ac61c4b134682235f6a9c Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Sat Aug 25 17:01:14 2007 +0100 scripts/makepkg.sh.in: Add missing [ Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 5c9eec5570c145c07660bd2ba207b579eda0f26c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 23 22:26:55 2007 -0400 libalpm: add newlines to all strings passed to log callback This allows us to remove the hack in the frontend where we added a newline to everything coming out of the pm_printf functions, and instead let the developer put newlines where they want them. This should be the last hangover of that auto-newline stuff. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2798ebbb6286b7a0acc4b5ff10906c1a92ecc946 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 23 20:47:40 2007 -0400 libalpm/remove.c: check for ability to unlink is wrong As reported by JGC in FS #7652, the check for EACCES is not exactly correct. We need to check for the ETXTBSY error as well. This is necessary on FreeBSD. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 656c895ca4a169ec933419ab9cea1897f08799e8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Aug 23 20:00:41 2007 +0200 makepkg : add -L (--dereference) to file. makepkg didn't correctly detect the type of the archive since it didn't dereference symlinks, and so failed to extract the source tarball. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 10c3f335d00a38429ce51d2ebcc636083a71d050 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 22 14:02:14 2007 -0400 pacman.c: clarify reason for doing 2 strcmp operations Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: lib/libalpm/add.c | 114 ++++++++++++++++++++++++------------------------ lib/libalpm/be_files.c | 34 +++++++------- lib/libalpm/cache.c | 18 ++++---- lib/libalpm/conflict.c | 28 ++++++------ lib/libalpm/db.c | 48 ++++++++++---------- lib/libalpm/deps.c | 52 +++++++++++----------- lib/libalpm/group.c | 2 +- lib/libalpm/handle.c | 14 +++--- lib/libalpm/package.c | 44 +++++++++--------- lib/libalpm/remove.c | 53 +++++++++++----------- lib/libalpm/server.c | 42 +++++++++--------- lib/libalpm/sync.c | 104 ++++++++++++++++++++++---------------------- lib/libalpm/trans.c | 38 ++++++++-------- lib/libalpm/util.c | 17 ++++--- scripts/makepkg.sh.in | 4 +- src/pacman/pacman.c | 4 ++ src/pacman/sync.c | 2 +- src/pacman/util.c | 2 - 18 files changed, 312 insertions(+), 308 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ e24bcc395e7da2a4f46933ea342d0ce90b708de4 \ 26441cf65ca10d4bf218203df5db5e8a7270787b

1 0

[pacman-dev] [PATCH 2/3] libalpm/deps.c : export _alpm_checkdeps (-> alpm_checkdeps).
by Chantry Xavier 26 Aug '07

26 Aug '07

2 1

[pacman-dev] [PATCH 1/3] libalpm/package.c : add new alpm_pkg_compute_requiredby function.
by Chantry Xavier 26 Aug '07

26 Aug '07

Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/package.c | 85 +++++++++++++++++++++++++++---------------------- 2 files changed, 48 insertions(+), 38 deletions(-)

1 0

Re: [pacman-dev] Database consistency checking
by Nagy Gabor 26 Aug '07

26 Aug '07

Well, I thought the following method (pseudocode) for (pkg in pkgcache) { pkgdup = alpm_pkg_dup(pkg); clean_requiredby(pkgdup); _alpm_pkg_update_requiredby(pkgdup); good = sort_then_compare_requiredby(pkg, pkgdup); alpm_pkg_free(pkgdup); } ------------- depend checking is similar, just use alpm_checkdeps for a list containing pkgdup only. ------------- Bye, ngaba PS: Sorry for replying your e-mail address earlier.

2 3

[pacman-dev] 3.1 release, pacman-git builds, etc.
by Dan McGee 25 Aug '07

25 Aug '07

I'll try to keep this short and sweet, and hopefully this wakes up the ghosts on the mailing list and we can make a push to get 3.1 released sometime in the relatively soon future. I've made a PKGBUILD that I threw together tonight to actually test pacman on my system without killing the working pacman 3.0.X install. It installs pacman and all its files to /usr/local, which is rather convenient for testing as you can just switch that directory in and out of your path as necessary. It also skips the complicated renames of files, and as a bonus, gives our autoconf script some testing with alternate install locations. However, it is configured to use your current db and cache at the /var location, so don't think that is necessarily safe (although it better be). Here is the most recent build as of when I am writing this email, use at your own risk! http://www.archlinux.org/~dan/pacman-git-3.1.0devel-2-i686.pkg.tar.gz http://www.archlinux.org/~dan/pacman-git_PKGBUILD With that said, I need your guys help testing this stuff out AND fixing the bugs and snags we hit that prevent us from releasing. The things on my list that definitely need to be done: * Ensure our config file changes are not necessary; e.g. old config files should mostly work with the new software. I fixed a few of these issues tonight. * General usability tests. Make sure things are acting as they should, no regressions, etc. * Merge the asciidoc branch and get our manpages up to snuff. * Figure out why Doxygen is generating some extra unnecessary manpages, and find a way to kill it. * makepkg testing. A lot of it, I haven't really used the new one at all since I tend to build official packages with the current release of makepkg to make sure it doesn't break things. * Translation updates. This could be a killer, but even if people don't get all the scripts translated we should try to get the pacman/libalpm translations back up to 100%. We lost a lot of messages because we cut debug translations, so that should help. * Testing of every bug on Flyspray marked "requires testing" and set to be fixed in 3.1. * Anything else you guys can think of. Please reply and post it and make sure it gets addressed. I've already got some ideas for 3.2/4.0 up my sleeve, but I'll put those in another email so we stay on topic here. And unless your idea is absolutely essential for a 3.1 release, try to keep them there as well. -Dan

4 8

[pacman-dev] FS#7308 implementation questions
by rprinse＠planet.nl 25 Aug '07

25 Aug '07

As I was browsing through the task list I stumbled upon FS#7308. This was a feature I also would like to have implemented so I thought why not try it myself! Because I'm lazy sometimes (who isn't) I don't always take care of any .pacnew or .pacsave files immediately so a nice timestamp suffix would prevent them from getting overwritten by pacman. Especially when you would like to see what changed overtime or when you just don't want that your old saved settings might get overwritten. So this is what i came up with: an AddDateSuffix directive in pacman.conf to enable this behaviour. If the option was enabled by the user add this timestamp suffix -YYYYMMDDHHMM (maybe even seconds??) right after .pac{new,save}. But while while going through some code I noticed the PATH_MAX constant, so can't we get in trouble if this is too small?? Flyspray link: http://bugs.archlinux.org/task/7308 I would really like to get some feedback, Thanks in advance, --DeliQ

3 4

[pacman-dev] hackish --ask option ?
by Xavier 24 Aug '07

24 Aug '07

Another interesting post from the forum : http://bbs.archlinux.org/viewtopic.php?id=35901 The documentation of the --ask option is quite funny indeed : --ask number Pre-specify answers to questions. It is doubtful whether this option even works, so I would not recommend using it. TODO: docu- ment this more, as I have no idea how it works or when you would use it, or if we should just dump it. I made an attempt of understanding what this option did, and then documenting it, but I doubt it's clear enough. I'm not sure what should be done here : 1) trying to document this option better 2) trying to implement this feature in a better way 3) just dropping it (not sure that's a good idea, since it's apparently useful in some cases). I think that's also low priority (ie not needed for 3.1), but feel free to comment on this issue.

3 4

[pacman-dev] Suggestion: Move local db to a different location
by Travis Willard 24 Aug '07

24 Aug '07

Here's a quick suggestion - far too many times I've seen people blow away their entire /var/lib/pacman/ folder in hopes of getting rid some error message or another, only to realize that pacman ALSO stores its locally-installed info there too and that they're now, essentially, screwed as far as pacman is concerned. Can we put this local info in a different place, or at least separate it from the remote db info a little more clearly? Like, for example, instead of the current set up of /var/lib/pacman/local /var/lib/pacman/current /var/lib/pacman/extra etc... we have /var/lib/pacman/local/ /var/lib/pacman/remote/current /var/lib/pacman/remote/extra etc... This structure, to me, makes more sense, since the "local" repo is a totally different beast from the remote repo info. This also allows the creation of a sync-able 'local' repo, like [local] http://localhost:8080/path/to/local/repo in pacman.conf without conflicting names. If nobody has any objections, I suppose I could hack a patch into the files backend that would do this, and possibly move from the current structure to the new one if it detects the old structure. In addition, those adventurous souls who like rm -r can be told to just rm -r /var/lib/pacman/remote and that will get rid of all remote repo information, which can be freshly obtained with pacman -Sy. I'm not trying to make it idiot-proof, but a clearer boundary between the local info, which should never be touched at the command line unless you really know what you're doing, and the remote stuff, that you can screw over until the cows come home and, in the end, just run pacman -Sy to get it all back. -- Travis

3 4

[pacman-dev] feature request: pacman lock file
by Thomas Bächler 23 Aug '07

23 Aug '07

I have several chroot environments that all use pacman as their package manager. I use a shared /tmp directory between them, so that X applications and some other things work across the chroots. This however is a problem with pacman, since pacman puts its lock file in /tmp/, which means I cannot use pacman simultaneously in these chroots. It would IMO be a better idea to put the lock file in /var/lib/pacman/ instead, which ensures that the lock file and the pacman database are always tied together.

3 4

Re: [pacman-dev] makepkg symlink dereference issue (was: 3.1 release, pacman-git builds, etc.)
by Dan McGee 23 Aug '07

23 Aug '07

On 8/23/07, Xavier <shiningxc(a)gmail.com> wrote: > On Wed, Aug 22, 2007 at 06:13:16AM +0100, Andrew Fyfe wrote: > > I've built quite a few packages with makepkg-3.1 and it appears to be > > working ok :) > > > > I thought it worked since I first tried it on pacman-git PKGBUILD. > But it actually fails with most PKGBUILDs using source tarballs. > > > >From 223d5606cab31c8695b9516ba21434da5529dedf Mon Sep 17 00:00:00 2001 > From: Chantry Xavier <shiningxc(a)gmail.com> > Date: Thu, 23 Aug 2007 20:00:41 +0200 > Subject: [PATCH] makepkg : add -L (--dereference) to file. > > makepkg didn't correctly detect the type of the archive > since it didn't dereference symlinks, and so failed > to extract the source tarball. > > Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Pulled this, thanks. -Dan

1 0

[pacman-dev] MD5/SHA* why?
by Andrew Fyfe 23 Aug '07

23 Aug '07

I asked this question a while ago about makepkg now I'm asking about pacman... why do we need support for multiple checksum types? What's wrong with md5? Andrew

10 28

[pacman-dev] Outdated comments in sync.c code ?
by Xavier 22 Aug '07

22 Aug '07

First this one: 515 /* hmmm, depend.name isn't installed, so it must be conflicting 516 * with another package in our final list. For example: 517 * 518 * pacman -S blackbox xfree86 519 * 520 * If no x-servers are installed and blackbox pulls in xorg, then 521 * xorg and xfree86 will conflict with each other. In this case, 522 * we should follow the user's preference and rip xorg out of final, 523 * opting for xfree86 instead. 524 */ 525 526 /* figure out which one was requested in targets. If they both 527 * were, then it's still an unresolvable conflict. */ I don't get it. Since xfree86 is already in the target, why would blackbox pull xorg ? That's not what the code does, but maybe it did before (I only tried git and cvs) ? If the following pactest is correct, then this comment doesn't apply anymore : self.description = "Choose provider in the targets first" sp1 = pmpkg("blackbox") sp1.depends = ["x-server"] self.addpkg2db("sync", sp1) sp2 = pmpkg("xfree86") sp2.provides = ["x-server"] self.addpkg2db("sync", sp2) sp3 = pmpkg("xorg") sp3.provides = ["x-server"] sp3.conflicts = ["xfree86"] self.addpkg2db("sync", sp3) self.args = "-S blackbox xfree86" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=blackbox") self.addrule("PKG_EXIST=xfree86") self.addrule("!PKG_EXIST=xorg") This one is even worse, I don't understand it at all : 638 /* XXX: this fails for cases where a requested package wants 639 * a dependency that conflicts with an older version of 640 * the package. It will be removed from final, and the user 641 * has to re-request it to get it installed properly. 642 * 643 * Not gonna happen very often, but should be dealt with... 644 */ I still tried to do a pactest following the instructions, and this works fine as well (git and cvs) : self.description = "A dep conflicts with older version of package" sp1 = pmpkg("pkg1", "1.0-2") sp1.depends = ["pkg2=1.0-2"] self.addpkg2db("sync", sp1) sp2 = pmpkg("pkg2", "1.0-2") sp2.conflicts = [ "pkg1=1.0-1" ] self.addpkg2db("sync", sp2) lp1 = pmpkg("pkg1", "1.0-1") lp1.depends = ["pkg2=1.0-1"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2", "1.0-1") lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) self.args = "-S pkg1" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg1|1.0-2") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_VERSION=pkg2|1.0-2")

2 2

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-358-ge24bcc3
by Dan McGee 22 Aug '07

22 Aug '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via e24bcc395e7da2a4f46933ea342d0ce90b708de4 (commit) via 515754faacf9dd33b94e6e5a17ca04d27d61f482 (commit) via d09d114e99c29d1392c546a6553650ecde5138fc (commit) via c22e381a8b86412b6c181446128affe32ab1d71e (commit) from 13525255dcd257e69d7c246bf32ceb263fbc31b9 (commit) - Log ----------------------------------------------------------------- commit e24bcc395e7da2a4f46933ea342d0ce90b708de4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 21 23:34:32 2007 -0400 configure.ac: Remove the hyphen from the version suffix Also switch out outdated PACKAGE_STRING variable for pacman_display_version. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 515754faacf9dd33b94e6e5a17ca04d27d61f482 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 21 23:29:10 2007 -0400 Various valgrind mem leak fixes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d09d114e99c29d1392c546a6553650ecde5138fc Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 21 21:53:38 2007 -0400 Add a default cachedir if one wasn't specified Use the default cachedir (specified at compile time) if one wasn't specified on the command line or in the config file. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c22e381a8b86412b6c181446128affe32ab1d71e Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 21 21:28:05 2007 -0400 Post trial install changes, round one A bunch of changes related to my first "real" install of pacman-git into /usr/local and trying to use it. * Shift some uses of free -> FREE in libalpm. * Move stat and sanity checks of config paths into libalpm from the config and argument parsing in pacman.c. * Fix issue where dbpath still was not defined early enough due to its requirement for being used in alpm_db_register. This should be rewritten so it doesn't have this dependency, but this will work for now. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: configure.ac | 4 +- lib/libalpm/alpm.h | 13 ++-- lib/libalpm/cache.c | 1 + lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 60 ++++++++-------- lib/libalpm/db.h | 1 - lib/libalpm/deps.c | 8 +- lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 182 ++++++++++++++++++++++++++++++++---------------- lib/libalpm/package.c | 2 +- lib/libalpm/server.c | 18 ++++-- lib/libalpm/sync.c | 8 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 2 +- src/pacman/Makefile.am | 2 + src/pacman/conf.c | 4 + src/pacman/conf.h | 9 ++- src/pacman/pacman.c | 107 ++++++++++++++-------------- 18 files changed, 258 insertions(+), 169 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 13525255dcd257e69d7c246bf32ceb263fbc31b9 \ e24bcc395e7da2a4f46933ea342d0ce90b708de4

1 0

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-354-g1352525
by Dan McGee 21 Aug '07

21 Aug '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 13525255dcd257e69d7c246bf32ceb263fbc31b9 (commit) via b1808930ce45a034981626fc20bbc7920890899e (commit) via 17d9122e01f5a675f4c7882e68ceae65aae7b5aa (commit) via 942175feaa866c4e536a7da0f77ab54de98b6c07 (commit) via 3acbf56bbab128d8ef037a7dcc87d91fe7354d14 (commit) from f81e619974ca47f6dba8c3002577447a71e0f1ec (commit) - Log ----------------------------------------------------------------- commit 13525255dcd257e69d7c246bf32ceb263fbc31b9 Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Wed Jul 25 14:47:46 2007 +0200 Add sync1003 pactest. The sync package pkg3 depends on the sync package pkg2, but pkg1 replaces pkg2. So pkg2 is added to the remove list. When checkdeps checks if pkg2 can be removed, it looks at the packages that require pkg2 (with the RequiredBy field of pkg2), but this doesn't contain pkg3 at this point. RequiredBy fields are only updated after the packages are installed. Proposed solution : checkdeps should know both the remove and upgrade list to decide properly. Reference: http://www.archlinux.org/pipermail/pacman-dev/2007-July/008972.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit b1808930ce45a034981626fc20bbc7920890899e Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Mon Jul 16 20:58:58 2007 +0200 libalpm/add.c,trans.c : cleanup of requiredby handling. This patch cleans up and fix the _alpm_trans_update_depends function and ensure that all requiredby fields are filled in case of multiple satisfiers (previously, the handling of mutliple satisfiers in that function was inconsistent). This makes a special case handling of requiredby in commit_single_pkg() obsolete, and so allows cleaning that code as well. Also fixed upgrade056 pactest because : 1) the requiredby fields were wrong, and this wouldn't happen with the fixed _alpm_trans_update_depends(). 2) this is a very unusual case anyway (and handling all corner cases combined to a broken database seems nearly impossible to achieve). References : http://www.archlinux.org/pipermail/pacman-dev/2007-July/008919.html http://www.archlinux.org/pipermail/pacman-dev/2007-July/008920.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 17d9122e01f5a675f4c7882e68ceae65aae7b5aa Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 20 13:28:51 2007 -0400 Fix for FS 6404 and functionalize some cachedir handling stuff In order to best resolve bug 6404, move some cachedir handling stuff out of sync.c and into util.c and create two new functions: filecache_find and filecache_setup. sync.c was rewritten to use these, and alpm_fetch_pkgurl now also uses these routines. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 942175feaa866c4e536a7da0f77ab54de98b6c07 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 20 12:55:38 2007 -0400 Add const qualifier to md5_file and alpm_get_md5sum Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3acbf56bbab128d8ef037a7dcc87d91fe7354d14 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 20 00:38:37 2007 -0400 Clean up architecture handling in configure.ac Remove the need for two variables for the architecture-specific switches (things like "-march=i686") by combining it into one variable. Also allow configure to proceed with only a warning if we don't have presets for the detected architecture- it is kind of stupid to restrict ourselves like we had been. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: configure.ac | 31 +++++------ etc/makepkg.conf.in | 4 +- lib/libalpm/add.c | 37 ------------- lib/libalpm/alpm.h | 2 +- lib/libalpm/md5.c | 6 ++- lib/libalpm/md5.h | 2 +- lib/libalpm/package.c | 19 +++---- lib/libalpm/server.c | 68 +++++++++++------------- lib/libalpm/server.h | 2 - lib/libalpm/sync.c | 123 +++++++++++-------------------------------- lib/libalpm/trans.c | 73 ++++--------------------- lib/libalpm/util.c | 73 ++++++++++++++++++++++++-- lib/libalpm/util.h | 2 + pactest/tests/sync1003.py | 26 +++++++++ pactest/tests/upgrade056.py | 1 + 15 files changed, 202 insertions(+), 267 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ f81e619974ca47f6dba8c3002577447a71e0f1ec \ 13525255dcd257e69d7c246bf32ceb263fbc31b9

1 0

[pacman-dev] dangerous symlink handling with --root option
by Mister Dobalina 21 Aug '07

21 Aug '07

Hi again, (and sorry again for any split lines) Okay, so I was fooling around with the --root option again, and after I realized from one of Xavier's posts that pre/post install scriptlets won't be run at all until /bin/sh (from bash) is installed, I figured I should install the packages twice. This led to two issues. I have a bash script (attached) that basically does: pkglist=( ... bunch o' base packages ... ) mkdir /tmp/pacman.test pacman -U --root /tmp/pacman.test ${pkglist[*]} pacman -U --root /tmp/pacman.test ${pkglist[*]} The second install of coreutils causes: error: cannot remove file '/tmp/pacman.test/usr/bin/sleep': Read-only file system error: failed to commit transaction (transaction aborted) error: failed to release transaction (could not commit transaction) First Issue: CPU usage then goes to 100%, so I assume that pacman has gone into an infinite loop somewhere. Second Issue: the real concern is the "Read-only file system" error, since /tmp is on a tmpfs and is definitely not read-only. My / partition is read-only though, and # ls -l /tmp/pacman.test/usr/bin/sleep lrwxrwxrwx 1 root root 10 2007-08-16 16:13 /tmp/pacman.test/usr/bin/sleep -> /bin/sleep So pacman was following the absolute symlink *out* of the --root and trying to remove /bin/sleep from my main arch install ?? Cheers, Jeremy Get news delivered with the All new Yahoo! Mail. Enjoy RSS feeds right on your Mail page. Start today at http://mrd.mail.yahoo.com/try_beta?.intl=ca

2 6

[pacman-dev] tmp permissions problem is back?
by Mister Dobalina 20 Aug '07

20 Aug '07

See below. Sorry for any split command lines, should be obvious where they are... cheers, Jeremy # pacman -Q pacman libarchive pacman 3.0.5-3 libarchive 2.2.6-1 # mkdir /tmp/pacman.test # pacman -Ud /var/cache/pacman/pkg/filesystem-2007.08-1.pkg.tar.gz --root /tmp/pacman.test # ls -l /tmp/pacman.test total 0 drwxr-xr-x 2 root root 40 2007-07-30 15:52 bin/ drwxr-xr-x 2 root root 40 2007-07-30 15:52 boot/ drwxr-xr-x 2 root root 40 2007-07-30 15:52 dev/ drwxr-xr-x 4 root root 440 2007-07-30 15:52 etc/ drwxr-xr-x 3 root root 60 2007-07-30 15:52 home/ drwxr-xr-x 3 root root 60 2007-07-30 15:52 lib/ drwxr-xr-x 5 root root 100 2007-07-30 15:52 mnt/ drwxr-xr-x 2 root root 40 2007-07-30 15:52 opt/ drwxr-xr-x 2 root root 40 2007-07-30 15:52 proc/ drwxr-x--- 2 root root 40 2007-07-30 15:52 root/ drwxr-xr-x 2 root root 40 2007-07-30 15:52 sbin/ drwxr-xr-x 2 root root 40 2007-07-30 15:52 srv/ drwxr-xr-x 2 root root 40 2007-07-30 15:52 sys/ drwxr-xr-x 2 root root 40 2007-08-20 12:09 tmp/ drwxr-xr-x 10 root root 220 2007-07-30 15:52 usr/ drwxr-xr-x 13 root root 280 2007-08-20 12:09 var/ Be smarter than spam. See how smart SpamGuard is at giving junk email the boot with the All-new Yahoo! Mail at http://mrd.mail.yahoo.com/try_beta?.intl=ca

3 8