April 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] One liner alpm_pkg_find
by Nagy Gabor 24 Apr '08

24 Apr '08

From 60e9d311b05f9d5e1d4d63476eb00ec85077e965 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 21 Apr 2008 13:29:01 +0200 Subject: [PATCH] One liner alpm_pkg_find This patch kills some code duplication. Note: There was a little confusion between alpm_list_remove's and alpm_list_find's compare functions. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/package.c | 16 +--------------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index ae54e19..ecfef25 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -577,7 +577,7 @@ void SYMEXPORT *alpm_list_find(const alpm_list_t *haystack, const void *needle, { const alpm_list_t *lp = haystack; while(lp) { - if(lp->data && fn(lp->data, needle) == 0) { + if(lp->data && fn(needle, lp->data) == 0) { return(lp->data); } lp = lp->next; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 6847415..c05f465 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -632,7 +632,7 @@ pmdb_t *_alpm_db_register_sync(const char *treename) * * @return "provision.name" == needle (as string) */ -int _alpm_prov_cmp(const void *provision, const void *needle) +int _alpm_prov_cmp(const void *needle, const void *provision) { char *tmpptr; char *provname = strdup(provision); diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index cec69be..280f2c0 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -196,7 +196,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse) } /* Little helper function for alpm_list_find */ -static int satisfycmp(const void *pkg, const void *depend) +static int satisfycmp(const void *depend, const void *pkg) { return(!alpm_depcmp((pmpkg_t*) pkg, (pmdepend_t*) depend)); } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 1ce0194..8c05c97 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1108,22 +1108,8 @@ error: */ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) { - alpm_list_t *lp; - ALPM_LOG_FUNC; - - if(needle == NULL || haystack == NULL) { - return(NULL); - } - - for(lp = haystack; lp; lp = lp->next) { - pmpkg_t *info = lp->data; - - if(info && strcmp(alpm_pkg_get_name(info), needle) == 0) { - return(info); - } - } - return(NULL); + return(alpm_list_find(haystack, needle, _alpm_pkgname_pkg_cmp)); } /** Test if a package should be ignored. -- 1.5.3.8

2 1

[pacman-dev] A minor issue
by Nagy Gabor 24 Apr '08

24 Apr '08

Hi! During the -Rs fix, I realized that recursedeps is available with -R only. So during conflict resolving or by installing replacer package pacman can create unwanted orphans. Bye

2 1

[pacman-dev] [PATCH] Kill compute_requiredby usage in deps.c/can_remove_package()
by Nagy Gabor 21 Apr '08

21 Apr '08

From 5b83eec6d87dc43a1f9dface9540220d8188edcf Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 20 Apr 2008 00:39:32 +0200 Subject: [PATCH] Kill compute_requiredby usage in deps.c/can_remove_package() After this patch compute_requiredby is used nowhere in back-end, so it can be optimized for front-end. * Before this patch the db param wasn't used, db == localdb was supposed * This is a minor speed-up, since we needn't calculate the whole requiredby list, if we find an ,,external'' member Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 1eebca3..4216e2c 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -439,7 +439,7 @@ pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep) static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, int include_explicit) { - alpm_list_t *i, *requiredby; + alpm_list_t *i, *j; if(_alpm_pkg_find(alpm_pkg_get_name(pkg), targets)) { return(0); @@ -461,15 +461,17 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, * if checkdeps detected it would break something */ /* see if other packages need it */ - requiredby = alpm_pkg_compute_requiredby(pkg); - for(i = requiredby; i; i = i->next) { - pmpkg_t *reqpkg = _alpm_db_get_pkgfromcache(db, i->data); - if(reqpkg && !_alpm_pkg_find(alpm_pkg_get_name(reqpkg), targets)) { - FREELIST(requiredby); - return(0); - } + for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { + pmpkg_t *lpkg = i->data; + for(j = alpm_pkg_get_depends(lpkg); j; j = j->next) { + if(alpm_depcmp(pkg, j->data)) { + if(!_alpm_pkg_find(lpkg->name, targets)) { + return(0); + } + break; + } + } } - FREELIST(requiredby); /* it's ok to remove */ return(1); -- 1.5.3.8

3 4

[pacman-dev] alpm_list_last
by Sebastian Nowicki 21 Apr '08

21 Apr '08

I noticed that alpm_list_last simply returns a pointer to the previous node. Is this expected behavior? My interpretation of "last" would be to return the absolute last node, as the comment suggests. In my opinion the function as it is now should be called alpm_list_prev. From alpm_list.c: > alpm_list_t SYMEXPORT *alpm_list_last(const alpm_list_t *list) > { > if(list) { > return(list->prev); > } else { > return(NULL); > } > } -- Sebastian Nowicki

2 5

[pacman-dev] makepkg PATH
by K. Piche 21 Apr '08

21 Apr '08

Hi, Coincidentally I had a PKGBUILD in my search path which confused me greatly when makepkg kept failing to work. Then it happened with extrapkg. I put a 'shopt -u sourcepath' before the 'source' commands. No sure if the path is needed elsewhere though. k -- K. Piche <kpiche(a)rogers.com>

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-9-gc465d9e
by Dan McGee 19 Apr '08

19 Apr '08

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 c465d9e848b19b495259c7021a583c29fba92b44 (commit) via 5e375aa9d387b2ef703dd35f60df1daad6a40237 (commit) from 0d8affeac01f40470c50e22cf721bd7a9b12050a (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: pactest/pmdb.py | 9 ++++++++- pactest/pmpkg.py | 23 ++++++++++++----------- pactest/pmtest.py | 4 ++-- 3 files changed, 22 insertions(+), 14 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-119-g423820b
by Dan McGee 19 Apr '08

19 Apr '08

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 423820b34c018e655aac5836873fef8dc475bd74 (commit) via 7a873a8f1284058c968c5d8026fbde7867913cb5 (commit) via 64e1dd64a4512a5faa34e6007e64314569593522 (commit) via c465d9e848b19b495259c7021a583c29fba92b44 (commit) via 5e375aa9d387b2ef703dd35f60df1daad6a40237 (commit) from bf84c232664fdce4861a2b94ce895c2b160b355a (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 423820b34c018e655aac5836873fef8dc475bd74 Merge: 7a873a8f1284058c968c5d8026fbde7867913cb5 c465d9e848b19b495259c7021a583c29fba92b44 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 19 16:18:40 2008 -0500 Merge branch 'maint' Conflicts: pactest/pmtest.py commit 7a873a8f1284058c968c5d8026fbde7867913cb5 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 19 12:36:18 2008 -0500 Give libalpm native support for both libdownload and libfetch This should remove the need for any additional patching to run on platforms that have libfetch available but not libdownload. It isn't the prettiest, but we have kept our libdownload impact down to just a few files, so it can be easily done. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 64e1dd64a4512a5faa34e6007e64314569593522 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 19 12:51:28 2008 -0500 Remove unnecessary NULL check in FREE() macro free() is designed to do nothing if it is passed a NULL pointer, so there is no need to check for it on our end. Change/fix the macro. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 ++++++--- lib/libalpm/dload.c | 21 +++++++++++++++++++-- lib/libalpm/error.c | 18 ++++++++++++++++-- lib/libalpm/util.h | 2 +- pactest/pmdb.py | 9 ++++++++- pactest/pmpkg.py | 23 ++++++++++++----------- pactest/pmtest.py | 4 ++-- 7 files changed, 64 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Pactest for removing multiple items in a dependency chain
by Allan McRae 19 Apr '08

19 Apr '08

From 6981d942fdd38710895df8741f490201712b79eb Mon Sep 17 00:00:00 2001 From: Allan McRae <mcrae_allan(a)hotmail.com> Date: Thu, 3 Apr 2008 16:35:14 +1000 Subject: [PATCH] Pactest for removing multiple items in a dependency chain This adds a test for when removing multilpe packages recursively from a chain of dependent packages. This situation can occur when removing installed dependencies with makepkg if a "makedepend" recursively depends on a "depend" or if redundant dependancies are included. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- pactest/tests/remove052.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/remove052.py diff --git a/pactest/tests/remove052.py b/pactest/tests/remove052.py new file mode 100644 index 0000000..53f516e --- /dev/null +++ b/pactest/tests/remove052.py @@ -0,0 +1,22 @@ +self.description = "-Rs test (dependency chain)" + +lp1 = pmpkg("pkg1") +lp1.reason = 1 +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.depends = ["pkg1"] +lp2.reason = 1 +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pkg3") +lp3.depends = ["pkg2"] +lp3.reason = 1 +self.addpkg2db("local", lp3) + +self.args = "-Rs %s" % " ".join([p.name for p in lp1, lp3]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") -- 1.5.4.5

2 3

[pacman-dev] Simple refactoring in remove.c
by K. Piche 16 Apr '08

16 Apr '08

>From 01b83715ef5e5dab3cb3eb5e2a3a660aaad5fb62 Mon Sep 17 00:00:00 2001 From: K. Piche <kevin(a)archlinux.org> Date: Fri, 4 Apr 2008 23:02:23 -0400 Subject: [PATCH] Pulled two loops out of _alpm_remove_prepare and gave them their own functions. Signed-off-by: K. Piche <kevin(a)archlinux.org> --- lib/libalpm/remove.c | 108 +++++++++++++++++++++++++++++++------------------ 1 files changed, 68 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 3119bf8..5ef32a2 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -81,6 +81,64 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) return(0); } + + +void _alpm_remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, alpm_list_t *lp) +{ + ALPM_LOG_FUNC; + + while(lp) { + alpm_list_t *i; + for(i = lp; i; i = i->next) { + pmdepmissing_t *miss = (pmdepmissing_t *)i->data; + pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target); + if(info) { + if(!_alpm_pkg_find(alpm_pkg_get_name(info), trans->packages)) { + _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", + alpm_pkg_get_name(info)); + trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); + } + } else { + _alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"), + miss->target); + } + } + alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); + alpm_list_free(lp); + lp = alpm_checkdeps(db, 1, trans->packages, NULL); + } +} + + + +void _alpm_remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, alpm_list_t *lp) +{ + ALPM_LOG_FUNC; + + /* Remove needed packages (which break dependencies) from the target list */ + while(lp != NULL) { + alpm_list_t *i; + for(i = lp; i; i = i->next) { + pmdepmissing_t *miss = (pmdepmissing_t *)i->data; + void *vpkg; + pmpkg_t *pkg; + trans->packages = alpm_list_remove(trans->packages, miss->causingpkg, + _alpm_pkgname_pkg_cmp, &vpkg); + pkg = vpkg; + if(pkg) { + _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", + alpm_pkg_get_name(pkg)); + _alpm_pkg_free(pkg); + } + } + alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); + alpm_list_free(lp); + lp = alpm_checkdeps(db, 1, trans->packages, NULL); + } +} + + + int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) { alpm_list_t *lp; @@ -101,49 +159,18 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) _alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n"); lp = alpm_checkdeps(db, 1, trans->packages, NULL); if(lp != NULL) { + if(trans->flags & PM_TRANS_FLAG_CASCADE) { - while(lp) { - alpm_list_t *i; - for(i = lp; i; i = i->next) { - pmdepmissing_t *miss = (pmdepmissing_t *)i->data; - pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target); - if(info) { - if(!_alpm_pkg_find(alpm_pkg_get_name(info), trans->packages)) { - _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", - alpm_pkg_get_name(info)); - trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); - } - } else { - _alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"), - miss->target); - } - } - alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); - alpm_list_free(lp); - lp = alpm_checkdeps(db, 1, trans->packages, NULL); - } + + _alpm_remove_prepare_cascade(trans, db, lp); + } else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) { - /* Remove needed packages (which break dependencies) from the target list */ - while(lp != NULL) { - alpm_list_t *i; - for(i = lp; i; i = i->next) { - pmdepmissing_t *miss = (pmdepmissing_t *)i->data; - void *vpkg; - pmpkg_t *pkg; - trans->packages = alpm_list_remove(trans->packages, miss->causingpkg, - _alpm_pkgname_pkg_cmp, &vpkg); - pkg = vpkg; - if(pkg) { - _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", - alpm_pkg_get_name(pkg)); - _alpm_pkg_free(pkg); - } - } - alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); - alpm_list_free(lp); - lp = alpm_checkdeps(db, 1, trans->packages, NULL); - } + + /* Remove needed packages (which would break dependencies) from the target list */ + _alpm_remove_prepare_keep_needed(trans, db, lp); + } else { + if(data) { *data = lp; } else { @@ -151,6 +178,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) alpm_list_free(lp); } RET_ERR(PM_ERR_UNSATISFIED_DEPS, -1); + } } } -- 1.5.4.5 -- K. Piche <kpiche(a)rogers.com>

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-7-g0d8affe
by Dan McGee 16 Apr '08

16 Apr '08

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 0d8affeac01f40470c50e22cf721bd7a9b12050a (commit) via c7a81c0b54c3b54e25978e9828c6dc91f113c19c (commit) via d685d0220fdb16097252bcf851ada5cf8400da0e (commit) from 4b7f7e2a59457aa881ae883b6d102f9fc62e2ed8 (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: acinclude.m4 | 4 ++-- configure.ac | 13 ++++++++++--- lib/libalpm/Makefile.am | 5 +++++ src/pacman/.gitignore | 1 + src/pacman/Makefile.am | 3 +-- 5 files changed, 19 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0