- 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

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-114-gbf84c23
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, master has been updated via bf84c232664fdce4861a2b94ce895c2b160b355a (commit) via 0d8affeac01f40470c50e22cf721bd7a9b12050a (commit) via c7a81c0b54c3b54e25978e9828c6dc91f113c19c (commit) via d685d0220fdb16097252bcf851ada5cf8400da0e (commit) from ba70c52945c9e568100ca3a4eeb3ea1208d378ad (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 bf84c232664fdce4861a2b94ce895c2b160b355a Merge: ba70c52945c9e568100ca3a4eeb3ea1208d378ad 0d8affeac01f40470c50e22cf721bd7a9b12050a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 15 19:07:51 2008 -0500 Merge branch 'maint' ----------------------------------------------------------------------- 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

[pacman-dev] libalpm documentation
by Sebastian Nowicki 15 Apr '08

15 Apr '08

It seems that libalpm is heavily undocumented. I was wondering if anyone is currently working on doxygen comments? Glancing over the code it seems in a few places there are comments for functions, but they aren't doxygen comments. They may not have in depth detail about the function, or describe how to use that function, but they do have a description, and that's better than nothing. I think a library should be useable by looking at only the documentation. With more clients springing up since libalpm came out, I think documentation should be a high priority. For me, libalpm is currently completely confusing and I have no idea how the functions and structs, etc., come together, so unfortunately without a lot of reading I won't be able to contribute much to the documentation. It is also difficult to actually use libalpm without reading through the code. While searching for any information about this I did find the bug (#9237 [1]) on flyspray, as well as the thread "Libalpm direction and usage by others" [2], but that seemed a bit more about the design of the API. Having reading that thread I think it might be worth saying that I am planning on creating an Objective-C wrapper for libalpm, as well as a front-end in Objective-C/Cocoa for Mac OS X. I don't know how that will turn out and it's mostly an idea, so I don't want to make any empty promises. Good documentation would definitely help me to do that, but unfortunately the documentation is not that great. If I do stick with the project I will most likely be going through the code and, once I understand it, documenting it. I think that the documentation could get to a decent state if developers progressively commented the functions and structs, etc., while changing the code. Taking a minute or two to just write a brief description would be great. Other developers could also later take a few seconds to document the parameters, then someone else could write up the details, etc. I saw a patch set yesterday that refactored code and it had doxygen comments for the new functions, which was great. [1] http://bugs.archlinux.org/index.php?do=details&task_id=9237 [2] http://archlinux.org/pipermail/pacman-dev/2008-March/011517.html

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-110-gba70c52
by Dan McGee 14 Apr '08

14 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 ba70c52945c9e568100ca3a4eeb3ea1208d378ad (commit) from 2d991a25ae23ca73a9fd01aacade9e2842c2f9db (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 ba70c52945c9e568100ca3a4eeb3ea1208d378ad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 14 18:24:45 2008 -0500 Fix compilation errors on x86_64 Things must have gotten stricter with GCC 4.3 on the '%zd' printf string and this is the first I've tried to compile there. Fix the problem by using size_t instead of int. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-109-g2d991a2
by Dan McGee 14 Apr '08

14 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 2d991a25ae23ca73a9fd01aacade9e2842c2f9db (commit) via db4258c1fdf27708968baf9c4e730a014af40fd8 (commit) via 9f561370348ce44b2a5453ba63a8bf405c69e6f3 (commit) from ee2bbb39b52e9a62bc295792339ff46e245fad19 (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 2d991a25ae23ca73a9fd01aacade9e2842c2f9db Author: K. Piche <kevin(a)archlinux.org> Date: Fri Apr 4 23:02:23 2008 -0400 remove.c: refactor into functions Pulled two loops out of _alpm_remove_prepare and gave them their own functions. Signed-off-by: K. Piche <kevin(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit db4258c1fdf27708968baf9c4e730a014af40fd8 Author: K. Piche <kevin(a)archlinux.org> Date: Tue Apr 8 23:30:46 2008 -0400 Some comments for _alpm_unpack. Signed-off-by: K. Piche <kevin(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f561370348ce44b2a5453ba63a8bf405c69e6f3 Author: K. Piche <kevin(a)archlinux.org> Date: Tue Apr 8 23:14:21 2008 -0400 add.c: added some tracing and improved some variable locality Signed-off-by: K. Piche <kevin(a)archlinux.org> [Dan: removed one logger] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 13 +++++-- lib/libalpm/remove.c | 99 ++++++++++++++++++++++++++++++-------------------- lib/libalpm/util.c | 11 ++++++ 3 files changed, 80 insertions(+), 43 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Add some tracing and move some variables in add.c
by K. Piche 14 Apr '08

14 Apr '08

>From 8f27d437dd27617969403a7113c178e8ccfa89c2 Mon Sep 17 00:00:00 2001 From: K. Piche <kevin(a)archlinux.org> Date: Tue, 8 Apr 2008 23:14:21 -0400 Subject: [PATCH] Added some tracing and improved some variable locality. Signed-off-by: K. Piche <kevin(a)archlinux.org> --- lib/libalpm/add.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 05935a7..a4ed175 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -195,6 +195,9 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm * with the type PM_TRANS_TYPE_REMOVEUPGRADE. TODO: kill this weird * behavior. */ pmtrans_t *tr = _alpm_trans_new(); + + ALPM_LOG_FUNC; + _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); @@ -285,6 +288,8 @@ static int extract_single_file(struct archive *archive, ARCHIVE_EXTRACT_TIME; int errors = 0; + ALPM_LOG_FUNC; + strncpy(entryname, archive_entry_pathname(entry), PATH_MAX); entrymode = archive_entry_mode(entry); @@ -631,14 +636,13 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, pmtrans_t *trans, pmdb_t *db) { int i, ret = 0, errors = 0; - struct archive *archive; - struct archive_entry *entry; - char cwd[PATH_MAX] = ""; char scriptlet[PATH_MAX+1]; int is_upgrade = 0; double percent = 0.0; pmpkg_t *oldpkg = NULL; + ALPM_LOG_FUNC; + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); @@ -693,6 +697,10 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { _alpm_log(PM_LOG_DEBUG, "extracting files\n"); + struct archive *archive; + struct archive_entry *entry; + char cwd[PATH_MAX] = ""; + if ((archive = archive_read_new()) == NULL) { RET_ERR(PM_ERR_LIBARCHIVE, -1); } @@ -700,6 +708,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, archive_read_support_compression_all(archive); archive_read_support_format_all(archive); + _alpm_log(PM_LOG_DEBUG, "archive: %s\n", newpkg->origin_data.file); if(archive_read_open_filename(archive, newpkg->origin_data.file, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { RET_ERR(PM_ERR_PKG_OPEN, -1); -- 1.5.4.5 -- K. Piche <kpiche(a)rogers.com>

2 1

[pacman-dev] be_files.c work
by K. Piche 14 Apr '08

14 Apr '08

Added functions to read standard types from db files. This is the first patch in a larger work to follow eventually. >From 84a7a5db2dc58a1ae800075d3acd604d18c86747 Mon Sep 17 00:00:00 2001 From: K. Piche <kevin(a)archlinux.org> Date: Sun, 13 Apr 2008 22:54:37 -0400 Subject: [PATCH] Add helper functions to read standard types from package database files. Signed-off-by: K. Piche <kevin(a)archlinux.org> --- lib/libalpm/be_files.c | 305 +++++++++++++++++++++++++++++++----------------- 1 files changed, 197 insertions(+), 108 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 7cc01c2..7d78296 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -244,6 +244,134 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) return(pkg); } + + +/********** db file type parsing **********/ + + + +/** + * @brief Read a string from a package's db file. + * @param fp File to read from. + * @param pstr pointer to char pointer to store the string. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_string(FILE *fp, char **pstr) +{ + char line[512]; + + ALPM_LOG_FUNC; + + if(fgets(line, 512, fp) == NULL) { + return(-1); + } + + STRDUP(*pstr, _alpm_strtrim(line), return(-1)); + + return(0); +} + + +/** + * @brief Read a long from a package's db file. + * @param fp File to read from. + * @param plong pointer to long to store the input. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_long(FILE *fp, unsigned long *plong) +{ + char line[512]; + + ALPM_LOG_FUNC; + + if(fgets(line, 512, fp) == NULL) { + return(-1); + } + + *plong = atol(_alpm_strtrim(line)); + + return(0); +} + + +/** + * @brief Read a list of strings from a package's db file. + * @param fp File to read from. + * @param plist pointer to alpm_list_t pointer to store the list. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_list(FILE *fp, alpm_list_t **plist) +{ + char line[512]; + + ALPM_LOG_FUNC; + + /* FIXME no error return */ + while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + char *linedup; + STRDUP(linedup, _alpm_strtrim(line), return(-1)); + *plist = alpm_list_add(*plist, linedup); + } + + return(0); +} + + +/** + * @brief Read a pmdepend_t list from a package's db file. + * @param fp File to read from. + * @param pdlist pointer to alpm_list_t pointer to store the dependencies. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_deplist(FILE *fp, alpm_list_t **pdlist) +{ + char line[512]; + + ALPM_LOG_FUNC; + + /* FIXME no error return */ + while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); + *pdlist = alpm_list_add(*pdlist, dep); + } + + return(0); +} + + +/** + * @brief Read a date from a package's db file. + * @param fp File to read from. + * @param pdate pointer to a long to store the date. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_date(FILE *fp, long *pdate) +{ + char line[512]; + + ALPM_LOG_FUNC; + + if(fgets(line, 512, fp) == NULL) { + return(-1); + } + _alpm_strtrim(line); + + char first = tolower(line[0]); + if(first > 'a' && first < 'z') { + struct tm tmp_tm = {0}; /* Initialize to null incase of failure. */ + setlocale(LC_TIME, "C"); + strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); + *pdate = mktime(&tmp_tm); + setlocale(LC_TIME, ""); + } else { + *pdate = atol(line); + } + + return(0); +} + + + int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; @@ -297,123 +425,89 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } + while(!feof(fp)) { if(fgets(line, 256, fp) == NULL) { break; } _alpm_strtrim(line); if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->filename, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->filename)) goto error; + } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->desc, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->desc)) goto error; + } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->groups = alpm_list_add(info->groups, linedup); - } + + if (_alpm_db_read_list(fp, &info->groups)) goto error; + } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->url, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->url)) goto error; + } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->licenses = alpm_list_add(info->licenses, linedup); - } + + if (_alpm_db_read_list(fp, &info->licenses)) goto error; + } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->arch, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->arch)) goto error; + } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->builddate = atol(line); - } + if (_alpm_db_read_date(fp, &info->builddate)) goto error; + } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->installdate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->installdate = atol(line); - } + if (_alpm_db_read_date(fp, &info->installdate)) goto error; + } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->packager, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->packager)) goto error; + } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->reason = atol(_alpm_strtrim(line)); + + unsigned long tempreason; + if (_alpm_db_read_long(fp, &tempreason)) goto error; + info->reason = tempreason; + } else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) { + /* NOTE: the CSIZE and SIZE fields both share the "size" field * in the pkginfo_t struct. This can be done b/c CSIZE * is currently only used in sync databases, and SIZE is * only used in local databases. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->size = atol(_alpm_strtrim(line)); + if (_alpm_db_read_long(fp, &info->size)) goto error; + /* also store this value to isize if isize is unset */ if(info->isize == 0) { info->isize = info->size; } + } else if(strcmp(line, "%ISIZE%") == 0) { + /* ISIZE (installed size) tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->isize = atol(_alpm_strtrim(line)); + if (_alpm_db_read_long(fp, &info->isize)) goto error; + } else if(strcmp(line, "%MD5SUM%") == 0) { + /* MD5SUM tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->md5sum, _alpm_strtrim(line), goto error); + if (_alpm_db_read_string(fp, &info->md5sum)) goto error; + } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->replaces = alpm_list_add(info->replaces, linedup); - } + + if (_alpm_db_read_list(fp, &info->replaces)) goto error; + } else if(strcmp(line, "%FORCE%") == 0) { info->force = 1; } } + fclose(fp); fp = NULL; } @@ -425,22 +519,20 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } + while(fgets(line, 256, fp)) { _alpm_strtrim(line); if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); - } + + if (_alpm_db_read_list(fp, &info->files)) goto error; + } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); - } + + if (_alpm_db_read_list(fp, &info->backup)) goto error; + } } + fclose(fp); fp = NULL; } @@ -452,34 +544,29 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } + while(!feof(fp)) { fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - info->depends = alpm_list_add(info->depends, dep); - } + + if (_alpm_db_read_deplist(fp, &info->depends)) goto error; + } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->optdepends = alpm_list_add(info->optdepends, linedup); - } + + if (_alpm_db_read_list(fp, &info->optdepends)) goto error; + } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); - } + + if (_alpm_db_read_list(fp, &info->conflicts)) goto error; + } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); - } + + if (_alpm_db_read_list(fp, &info->provides)) goto error; + } } + fclose(fp); fp = NULL; } @@ -489,6 +576,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) snprintf(path, PATH_MAX, "%s/%s-%s/deltas", db->path, info->name, info->version); if((fp = fopen(path, "r"))) { + while(!feof(fp)) { fgets(line, 255, fp); _alpm_strtrim(line); @@ -498,6 +586,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } } } + fclose(fp); fp = NULL; } -- 1.5.5 -- K. Piche <kpiche(a)rogers.com>

1 0

[pacman-dev] .pacnew created when not needed, was: [signoff] openssh 5.0p1
by Roman Kyrylych 11 Apr '08

11 Apr '08

2008/4/10, Xavier <shiningxc(a)gmail.com>: > On Thu, Apr 10, 2008 at 9:23 AM, Roman Kyrylych > <roman.kyrylych(a)gmail.com> wrote: > > > > Hmm.. > > pacman created /etc/ssh/sshd_config.pacnew, but I didn't modify > > sshd_config, so I wonder why pacman didn't just overwrite it. :-/ > > > > > Could you keep your /etc/ssh/sshd_config file, downgrade openssh to > the older version, then check the output of pacman -Qii openssh ? > And check the md5sum manually if needed. > > If it tells you sshd_config is indeed not modified, try upgrading > again, using --debug this time, and check the debug output of pacman. I've deleted that file already. But I had an older snapshot so I've tried to reproduce the issue again. And I got it clearly reproduceable: 0) I have clean install from 0.4 archboot iso (IIRC) in vmware with pacman 3.1.3 and no openssh, only some packages were upgraded, so package database is not broken 1) pacman -S openssh --noconfirm --debug > install.log 2) pacman -Syu only upgrading pacman from 3.1.3 to 3.1.4 3) pacman -S openssh --noconfirm --debug > upgrade.log (upgrading from 4.7 to 5.0 where default sshd_config was chaged) 4) ls /etc/ssh/ moduli ssh_config sshd_config sshd_config.pacnew 5) pacman -Qii openssh | grep -A3 Backup > Qii.txt Logs are attached. As can be seen from upgrade.log pacman makes a wrong decission when comparing existing, new and original md5sums (original is empty). I'm keeping that old snapshot so I can reproduce the issue again if more debugging is needed. -- Roman Kyrylych (Роман Кирилич)

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-106-gee2bbb3
by Dan McGee 11 Apr '08

11 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 ee2bbb39b52e9a62bc295792339ff46e245fad19 (commit) via 4bd0a850953b97cdf6ee6b96871302d9ceb2bcec (commit) via e9a0d35d088d89e26c7dd2820a2f61359d213700 (commit) via 4b7f7e2a59457aa881ae883b6d102f9fc62e2ed8 (commit) from 57acfced0d1b0d6fdff34bf778c92f04c9814a52 (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 ee2bbb39b52e9a62bc295792339ff46e245fad19 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 8 18:54:25 2008 -0500 Memory allocation and other small cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4bd0a850953b97cdf6ee6b96871302d9ceb2bcec Merge: e9a0d35d088d89e26c7dd2820a2f61359d213700 4b7f7e2a59457aa881ae883b6d102f9fc62e2ed8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 10 20:54:34 2008 -0500 Merge branch 'maint' commit e9a0d35d088d89e26c7dd2820a2f61359d213700 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 10 20:53:28 2008 -0500 Remove unnecessary import in dload.h We no longer expose any of libdownload in our public functions, so no need to include this header anymore. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 28 ++++++++++++---------------- lib/libalpm/dload.h | 1 - 2 files changed, 12 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-4-g4b7f7e2
by Dan McGee 11 Apr '08

11 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 4b7f7e2a59457aa881ae883b6d102f9fc62e2ed8 (commit) from bec2ba5b4005053ce8f7048fa825ed58e3adfdc2 (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/add.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] libdownload portability
by Sebastian Nowicki 10 Apr '08

10 Apr '08

I'm looking into making a package manager for Mac OSX and I'd like to use libalpm but currently it doesn't compile. I haven't tested this on any real BSD systems but OS X is based on BSD so I assume it also doesn't compile on BSD either. libdownload fails to co,pile because it can't find libio.h, which appears to be a part of glibc on Linux. I know Aaron forked libfetch and added some features, so I'm wondering if it's possible to port those features back to BSD. If it is, I'd be willing to look into doing so, but since my experience with C is low I don't know how that will work out. For any BSD users, is there an alternative to libio.h, hopefully with a similar API, that would work with libdownload?

2 2

[pacman-dev] added some comments to _alpm_unpack
by K. Piche 10 Apr '08

10 Apr '08

>From 2ded6c6f0a30eb10cf811ff70db6e0f1c62a6b50 Mon Sep 17 00:00:00 2001 From: K. Piche <kevin(a)archlinux.org> Date: Tue, 8 Apr 2008 23:30:46 -0400 Subject: [PATCH] Some comments for _alpm_unpack. Signed-off-by: K. Piche <kevin(a)archlinux.org> --- lib/libalpm/util.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 9d86331..9f431ed 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -370,6 +370,13 @@ int _alpm_lckrm() /* Compression functions */ +/** + * @brief Unpack a specific file or all files in an archive. + * + * @param archive the archive to unpack + * @param prefix where to extract the files + * @param fn a file within the archive to unpack or NULL for all + */ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) { int ret = 1; @@ -407,13 +414,17 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) archive_entry_set_mode(entry, 0755); } + /* If a specific file was requested skip entries that don't match. */ if (fn && strcmp(fn, entryname)) { + _alpm_log(PM_LOG_DEBUG, "skipping: %s\n", entryname); if (archive_read_data_skip(_archive) != ARCHIVE_OK) { ret = 1; goto cleanup; } continue; } + + /* Extract the archive entry. */ ret = 0; snprintf(expath, PATH_MAX, "%s/%s", prefix, entryname); archive_entry_set_pathname(entry, expath); -- 1.5.4.5 -- K. Piche <kpiche(a)rogers.com>

1 0

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

08 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 bec2ba5b4005053ce8f7048fa825ed58e3adfdc2 (commit) via 9441fba12430f568b8b7456fcbe54d4c8a42d24d (commit) via b3f4bd9750821787d179340b0d1c7a5490276c10 (commit) from 0b8abf376f4a34d18aed450642284d9410522667 (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: configure.ac | 4 ++-- contrib/pacdiff | 2 +- src/pacman/.gitignore | 1 + src/pacman/callback.c | 10 ++++++++++ src/util/.gitignore | 3 +++ 5 files changed, 17 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

08 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 57acfced0d1b0d6fdff34bf778c92f04c9814a52 (commit) via 83c4b2aebbb7d2a71eecc672987deca1d4846f0b (commit) via bec2ba5b4005053ce8f7048fa825ed58e3adfdc2 (commit) via 9441fba12430f568b8b7456fcbe54d4c8a42d24d (commit) via a708c6eadc107475015eb2fbe2c7ec5d00bc0099 (commit) via 9c7ebe68724791f06cdde2febdf91f0472f18407 (commit) via 4c872594da321aa406cfb306c32c94ce2929d59e (commit) via e4a4cf7ce544707faa691c8ab1bf298549979b12 (commit) via 4004bf9caf60231e9ad008f36325412bd20a611c (commit) via 404e0a0e10c1fbf9732f32a8c4bd466b026c34b1 (commit) via b3f4bd9750821787d179340b0d1c7a5490276c10 (commit) from 073bac794d7643fae21dacbe3d5c1585ce347bea (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 57acfced0d1b0d6fdff34bf778c92f04c9814a52 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 7 19:07:51 2008 -0500 Update configure.ac to current code Remove a few functions and things that were unnecessary, update the help line calls to the current function name, and make the small change to pacman.c for the signal handler return type that is defined in config.h. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83c4b2aebbb7d2a71eecc672987deca1d4846f0b Merge: a708c6eadc107475015eb2fbe2c7ec5d00bc0099 bec2ba5b4005053ce8f7048fa825ed58e3adfdc2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 7 19:19:34 2008 -0500 Merge branch 'maint' commit a708c6eadc107475015eb2fbe2c7ec5d00bc0099 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 6 21:00:11 2008 -0500 Allow disabling of internal (libdownload) code Add a new --disable-internal-download flag to configure allowing the internal download code to be skipped. This will be helpful on platforms that currently don't support either libdownload or libfetch (such as Cygwin) and for just compiling a lighter weight pacman binary. This was made really easy by our recent refactoring of the download code into separate internal and external functions, as well as some error code cleanup. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9c7ebe68724791f06cdde2febdf91f0472f18407 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 6 20:28:43 2008 -0500 Remove a bit more download.h pollution Kill it where it isn't absolutely necessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4c872594da321aa406cfb306c32c94ce2929d59e Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 6 20:20:20 2008 -0500 Remove unnecessary header file, move one macro to util.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e4a4cf7ce544707faa691c8ab1bf298549979b12 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 6 20:09:27 2008 -0500 libalpm error cleanup, step 1 Remove unused error codes, begin refactoring some of the others. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4004bf9caf60231e9ad008f36325412bd20a611c Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 6 19:58:10 2008 -0500 Remove libdownload reference from pacman frontend Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 404e0a0e10c1fbf9732f32a8c4bd466b026c34b1 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 6 19:49:41 2008 -0500 Add quiet printout to --owns functionality If we specify -q/--quiet on an --owns operation, only print a matching package name rather than the verbose human-readable message. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 48 ++++++++++++++++++++---------- contrib/pacdiff | 2 +- lib/libalpm/Makefile.am | 2 +- lib/libalpm/add.c | 3 +- lib/libalpm/alpm.c | 1 - lib/libalpm/alpm.h | 14 ++------ lib/libalpm/be_files.c | 1 - lib/libalpm/cache.c | 1 - lib/libalpm/conflict.c | 1 - lib/libalpm/db.c | 11 ++----- lib/libalpm/delta.c | 1 - lib/libalpm/deps.c | 1 - lib/libalpm/dload.c | 75 +++++++++++++++++++++++++++++----------------- lib/libalpm/error.c | 38 ++++++++++++----------- lib/libalpm/error.h | 28 ----------------- lib/libalpm/group.c | 1 - lib/libalpm/handle.c | 1 - lib/libalpm/log.c | 1 - lib/libalpm/package.c | 9 ++--- lib/libalpm/remove.c | 1 - lib/libalpm/sync.c | 1 - lib/libalpm/trans.c | 1 - lib/libalpm/util.c | 3 +- lib/libalpm/util.h | 4 ++ src/pacman/.gitignore | 1 + src/pacman/callback.c | 10 ++++++ src/pacman/pacman.c | 2 +- src/pacman/query.c | 11 +++++-- src/pacman/sync.c | 19 +---------- src/util/.gitignore | 3 ++ src/util/testpkg.c | 2 +- 31 files changed, 144 insertions(+), 153 deletions(-) delete mode 100644 lib/libalpm/error.h hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Quote filenames in find expression in pacdiff
by Allan McRae 06 Apr '08

06 Apr '08

From 41cc28f560bf9843d81ce5fb62b884b6325d06a0 Mon Sep 17 00:00:00 2001 From: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sun, 6 Apr 2008 22:18:06 +1000 Subject: [PATCH] Quote filenames in find expression in pacdiff Small patch to allow pacdiff to run in /etc. See FS#10090. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- contrib/pacdiff | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/pacdiff b/contrib/pacdiff index 19a680f..6493649 100755 --- a/contrib/pacdiff +++ b/contrib/pacdiff @@ -20,7 +20,7 @@ # Original http://phraktured.net/config/bin/pacdiff diffprog=${DIFFPROG:-vimdiff} -for x in $(find /etc/ -name *.pacnew -o -name *.pacorig -o -name *.pacsave) +for x in $(find /etc/ -name "*.pacnew" -o -name "*.pacorig" -o -name "*.pacsave") do echo "File: ${x%.pac*}" chk="$(cmp $x ${x%.pac*})" -- 1.5.4.5

1 0

[pacman-dev] [PATCH] No error in makepkg when removing deps fails
by Allan McRae 04 Apr '08

04 Apr '08

From 9beeed7c54d94a95c9e0bccb863e9b09ea18bd4f Mon Sep 17 00:00:00 2001 From: Allan McRae <mcrae_allan(a)hotmail.com> Date: Thu, 3 Apr 2008 01:07:25 +1000 Subject: [PATCH] No error in makepkg when removing deps fails Catches error from when pacman is unable to remove dependencies after successfully building package and prints warning. Fixes FS#10039. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- scripts/makepkg.sh.in | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1eb3d3a..395d525 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -447,10 +447,17 @@ remove_deps() { done msg "Removing installed dependencies..." + local ret=0 if [ "$ASROOT" = "0" ]; then - sudo pacman $PACMAN_OPTS -Rns $deplist + sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? else - pacman $PACMAN_OPTS -Rns $deplist + pacman $PACMAN_OPTS -Rns $deplist || ret=$? + fi + + # Fixes FS#10039 - exit cleanly as package has built successfully + if [ $ret -ne 0 ]; then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 fi } -- 1.5.4.5

4 11