- Pacman-dev - lists.archlinux.org

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

30 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 27943a04d6dd135628c2313525ebffbcd76cc514 (commit) from c465d9e848b19b495259c7021a583c29fba92b44 (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: scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

30 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 5389cdf65431e6daf219b9bb8f8985c6c33b1996 (commit) via 6b3118357614ad37149591ec457447387de0d2ac (commit) via 8f902865d932aea0570daea2220566e4093d6211 (commit) via 010279e449e87fb42fe587b649ed0e9994e65dba (commit) via 4e6361642e632b8631e3d12ee33b1cf5293edb83 (commit) via 1201c8ce3aa6a8622400e4423c532c19e83f48aa (commit) via 245efca759adfcaf7e8d032477a9fe6e22860d86 (commit) via 27943a04d6dd135628c2313525ebffbcd76cc514 (commit) from 6d79ba2db0f37f46b925a509ef83724fc0f61184 (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 5389cdf65431e6daf219b9bb8f8985c6c33b1996 Merge: 6b3118357614ad37149591ec457447387de0d2ac 27943a04d6dd135628c2313525ebffbcd76cc514 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 29 19:52:06 2008 -0500 Merge branch 'maint' commit 6b3118357614ad37149591ec457447387de0d2ac Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Tue Apr 29 21:30:28 2008 +0200 Doxyfile : enable JAVADOC_AUTOBRIEF. From http://www.stack.nl/~dimitri/doxygen/config.html#cfg_javadoc_autobrief JAVADOC_AUTOBRIEF If the JAVADOC_AUTOBRIEF is set to YES then doxygen will interpret the first line (until the first dot) of a JavaDoc-style comment as the brief description. If set to NO (the default), the Javadoc-style will behave just like regular Qt-style comments (thus requiring an explicit @brief command for a brief description.) Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f902865d932aea0570daea2220566e4093d6211 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Sun Apr 27 18:54:38 2008 +0800 Add documentation for transaction events It is hard to decipher what the transaction events actually notify you of, and what parameters are passed to the callback function, without looking at the code. This patch adds documentation for the _pmtransevt_t enum in order to clarify what the event is for and what data is passed when the callback is called. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 010279e449e87fb42fe587b649ed0e9994e65dba Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 28 22:23:31 2008 -0500 Updates to _alpm_copyfile() Rework to use a single #define for the buffsize, and in the process clean up some other code and double the default buffer size. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4e6361642e632b8631e3d12ee33b1cf5293edb83 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 28 22:19:56 2008 -0500 Rework extract_single_file() temp file creation We were a bit juryrigged using one call to mkstemp() before rather than extracting the new files side-by-side and doing our comparisons there. We were also facing some permissions issues. Instead, make our life easier by extracting all temp files to a '.paccheck' extension, doing our md5 comparisons, and then taking the correct actions. Still to be done here- a cleanup of the use of PATH_MAX which should not be necessary if we use dynamic allocation on the heap. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1201c8ce3aa6a8622400e4423c532c19e83f48aa Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 28 20:41:30 2008 -0500 Update pactest to allow setting modes on created files This should allow some future tests to set modes and ensure they are set after installation. It is also in anticipation of a test for checking permissions on pacnew files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 245efca759adfcaf7e8d032477a9fe6e22860d86 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 27 17:27:05 2008 -0500 Remove unnecessary archive_entry_set_pathname() calls I'm not sure why these were ever here, as by this point we have already extracted the file meaning a call to this function is basically a no-op. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Doxyfile | 2 +- lib/libalpm/add.c | 68 +++++++++++++++++++++++---------------------- lib/libalpm/alpm.h | 59 +++++++++++++++++++++++++++++++++++++++- lib/libalpm/util.c | 22 +++++++++----- pactest/tests/mode001.py | 2 +- pactest/tests/mode002.py | 12 ++++++++ pactest/tests/mode003.py | 20 +++++++++++++ pactest/util.py | 40 ++++++++++++++------------- scripts/makepkg.sh.in | 10 ++++--- 9 files changed, 168 insertions(+), 67 deletions(-) create mode 100644 pactest/tests/mode002.py create mode 100644 pactest/tests/mode003.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove unnecessary archive_entry_set_pathname() calls
by Dan McGee 29 Apr '08

29 Apr '08

I'm not sure why these were ever here, as by this point we have already extracted the file meaning a call to this function is basically a no-op. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ca4cfa9..6795d52 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -500,19 +500,16 @@ static int extract_single_file(struct archive *archive, /* move the existing file to the "pacorig" */ if(rename(filename, newpath)) { - archive_entry_set_pathname(entry, filename); _alpm_log(PM_LOG_ERROR, _("could not rename %s (%s)\n"), filename, strerror(errno)); alpm_logaction("error: could not rename %s (%s)\n", filename, strerror(errno)); errors++; } else { /* copy the tempfile we extracted to the real path */ if(_alpm_copyfile(tempfile, filename)) { - archive_entry_set_pathname(entry, filename); _alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno)); alpm_logaction("error: could not copy tempfile to %s (%s)\n", filename, strerror(errno)); errors++; } else { - archive_entry_set_pathname(entry, filename); _alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath); alpm_logaction("warning: %s saved as %s\n", filename, newpath); } @@ -531,7 +528,6 @@ static int extract_single_file(struct archive *archive, _alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno)); errors++; } - archive_entry_set_pathname(entry, filename); } else { /* there's no sense in installing the same file twice, install * ONLY is the original and package hashes differ */ -- 1.5.5.1

2 5

[pacman-dev] [PATCH] Remove unnecessary archive_entry_set_pathname() calls
by Dan McGee 29 Apr '08

29 Apr '08

I'm not sure why these were ever here, as by this point we have already extracted the file meaning a call to this function is basically a no-op. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ca4cfa9..6795d52 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -500,19 +500,16 @@ static int extract_single_file(struct archive *archive, /* move the existing file to the "pacorig" */ if(rename(filename, newpath)) { - archive_entry_set_pathname(entry, filename); _alpm_log(PM_LOG_ERROR, _("could not rename %s (%s)\n"), filename, strerror(errno)); alpm_logaction("error: could not rename %s (%s)\n", filename, strerror(errno)); errors++; } else { /* copy the tempfile we extracted to the real path */ if(_alpm_copyfile(tempfile, filename)) { - archive_entry_set_pathname(entry, filename); _alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno)); alpm_logaction("error: could not copy tempfile to %s (%s)\n", filename, strerror(errno)); errors++; } else { - archive_entry_set_pathname(entry, filename); _alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath); alpm_logaction("warning: %s saved as %s\n", filename, newpath); } @@ -531,7 +528,6 @@ static int extract_single_file(struct archive *archive, _alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno)); errors++; } - archive_entry_set_pathname(entry, filename); } else { /* there's no sense in installing the same file twice, install * ONLY is the original and package hashes differ */ -- 1.5.5.1

1 0

[pacman-dev] [PATCH] Add documentation for transaction events
by Sebastian Nowicki 28 Apr '08

28 Apr '08

It is hard to decipher what the transaction events actually notify you of, and what parameters are passed to the callback function, without looking at the code. This patch adds documentation for the _pmtransevt_t enum in order to clarify what the event is for and what data is passed when the callback is called. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- lib/libalpm/alpm.h | 166 +++++++++++++++++++++++++++++++++++++++++++ ++++++++- 1 files changed, 165 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index a7ea063..0c2da10 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -283,36 +283,200 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_RECURSEALL = 0x10000 } pmtransflag_t; -/* Transaction Events */ +/** + * @addtogroup alpm_trans + * @brief Transaction events + */ +/*@{*/ typedef enum _pmtransevt_t { + /** + * @brief Dependencies will be computed for a package + * + * No paramaters are passed + */ PM_TRANS_EVT_CHECKDEPS_START = 1, + + /** + * @brief Dependencies were computed for a package + * + * No paramaters are passed + */ PM_TRANS_EVT_CHECKDEPS_DONE, + + /** + * @brief File conflicts will be computed for a package + * + * No paramaters are passed + */ PM_TRANS_EVT_FILECONFLICTS_START, + + /** + * @brief File conflicts were computed for a package + * + * No paramaters are passed + */ PM_TRANS_EVT_FILECONFLICTS_DONE, + + /** + * @brief Dependencies will be resolved for target package + * + * No paramaters are passed + */ PM_TRANS_EVT_RESOLVEDEPS_START, + + /** + * @brief Dependencies were resolved for target package + * + * No paramaters are passed + */ PM_TRANS_EVT_RESOLVEDEPS_DONE, + + /** + * @brief Inter-conflicts will be checked for target package + * + * No paramaters are passed + */ PM_TRANS_EVT_INTERCONFLICTS_START, + + /** + * @brief Inter-conflicts were checked for target package + * + * No paramaters are passed + */ PM_TRANS_EVT_INTERCONFLICTS_DONE, + + /** + * @brief Package will be installed + * + * A pointer to the target package is passed to the callback + */ PM_TRANS_EVT_ADD_START, + + /** + * @brief Package was installed + * + * A pointer to the new package is passed to the callback + */ PM_TRANS_EVT_ADD_DONE, + + /** + * @brief Package will be removed + * + * A pointer to the target package is passed to the callback + */ PM_TRANS_EVT_REMOVE_START, + + /** + * @brief Package was removed + * + * A pointer to the removed package is passed to the callback + */ PM_TRANS_EVT_REMOVE_DONE, + + /** + * @brief Package will be upgraded + * + * A pointer to the upgraded package is passed to the callback + */ PM_TRANS_EVT_UPGRADE_START, + + /** + * @brief Package was upgraded + * + * A pointer to the new package, and a pointer to the old package is + * passed to the callback, respectively + */ PM_TRANS_EVT_UPGRADE_DONE, + + /** + * @brief Package waas extracted + * + * No paramaters are passed + */ PM_TRANS_EVT_EXTRACT_DONE, + + /** + * @brief Target package's integrity will be checked + * + * No paramaters are passed + */ PM_TRANS_EVT_INTEGRITY_START, + + /** + * @brief Target package's integrity was checked + * + * No paramaters are passed + */ PM_TRANS_EVT_INTEGRITY_DONE, + + /** + * @brief Target deltas's integrity will be checked + * + * No paramaters are passed + */ PM_TRANS_EVT_DELTA_INTEGRITY_START, + + /** + * @brief Target delta's integrity was checked + * + * No paramaters are passed + */ PM_TRANS_EVT_DELTA_INTEGRITY_DONE, + + /** + * @brief Deltas will be applied to packages + * + * No paramaters are passed + */ PM_TRANS_EVT_DELTA_PATCHES_START, + + /** + * @brief Deltas were applied to packages + * + * No paramaters are passed + */ PM_TRANS_EVT_DELTA_PATCHES_DONE, + + /** + * @brief Delta patch will be applied to target package + * + * The filename of the package and the filename of the patch is passed to + * the callback + */ PM_TRANS_EVT_DELTA_PATCH_START, + + /** + * @brief Delta patch was applied to target package + * + * No paramaters are passed + */ PM_TRANS_EVT_DELTA_PATCH_DONE, + + /** + * @brief Delta patch failed to apply to target package + * + * No paramaters are passed + */ PM_TRANS_EVT_DELTA_PATCH_FAILED, PM_TRANS_EVT_SCRIPTLET_INFO, + + /** + * @brief Print URI + * + * The database's URI and the package's filename are passed to the + * callback + */ PM_TRANS_EVT_PRINTURI, + + /** + * @brief Files will be downloaded from a repository + * + * The repository's tree name is passed to the callback + */ PM_TRANS_EVT_RETRIEVE_START, } pmtransevt_t; +/*@}*/ /* Transaction Conversations (ie, questions) */ typedef enum _pmtransconv_t { -- 1.5.4.5 -- Sebastian Nowicki

4 11

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

27 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 6d79ba2db0f37f46b925a509ef83724fc0f61184 (commit) via 481c3edc89fa674f9723c13ab4d12f032cf8ca02 (commit) via 8fdf08ef782d234efe7957873839433ced64ffcc (commit) via 670fadf0411bbdd75a8db75ef46f55b1d9db339a (commit) via 701a03dcdb113e92b4f8de52a7a427dfdfc3dd27 (commit) via 30bdf94c2b444ff475a32e7b0c569e8c3cf05797 (commit) via ff9744aa1f9d3da380e722fd44a07b8c8a68d101 (commit) via 1b5a851851cce4ae53e82fdec128ff6d6f73393b (commit) from 423820b34c018e655aac5836873fef8dc475bd74 (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 6d79ba2db0f37f46b925a509ef83724fc0f61184 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 26 13:03:53 2008 -0500 Fix some fallout from the delta/download changes We removed one too many FREELIST() calls when trying to fix some memleaks, and add a safety/sanity check to ensure filename is set, as packages in old DBs are likely to not have this field. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 481c3edc89fa674f9723c13ab4d12f032cf8ca02 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Wed Feb 13 20:42:43 2008 +0100 get_filename : use the FILENAME db field only. Reference : FS#9547. The get_filename function first tries to get the filename field from the database, and if it doesn't find it, it tries to guess it based on the name, version and arch. This field was introduced in 3.0, but there are still many old entries in the official databases without it. So the databases need to be regenerated first before this patch can be applied. There is a second problem with the delta code, which needs the filename for locally installed packages too, but this field is not present in the local db. So the delta code needs to be fixed first. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8fdf08ef782d234efe7957873839433ced64ffcc Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Wed Feb 27 17:45:01 2008 +0100 libalpm/sync.c : memleak fixes. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 670fadf0411bbdd75a8db75ef46f55b1d9db339a Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Wed Feb 27 16:09:49 2008 +0100 Get rid of the delta patches list As Nathan noticed, the new informations in the delta struct allows us to get rid of this list : http://www.archlinux.org/pipermail/pacman-dev/2008-February/011163.html So I rewrote apply_deltas for that. The previous apply_deltas also had a limitation: it assumed that the initial package and the deltas were in the first cache dir, which is not necessarily the case. That situation is supported now. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 701a03dcdb113e92b4f8de52a7a427dfdfc3dd27 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Feb 16 10:47:22 2008 -0600 Completely rework delta algorithm Using the graph structures that Nagy set up for dependency sorting, we now do a similar process for deltas. Load up all of the deltas into a graph object on which we can then apply Dijkstra's algorithm, using the new weight field of graph struct. We initialize the nodes weight using the base files that we can use in our filecache (both filename and md5sum must match). The algorithm then picks the best path among those that can be resolved. Note that this algorithm has a few advantages over the old one: 1. It is completely file agnostic. These delta chains do not have to consist of package files- this could be adopted to do delta-fied DBs. 2. It does not use the local_db anymore, or even care if a package or file is currently installed. Instead, it only looks in the filecache for files and packages that match delta chain entries. Original-work-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 30bdf94c2b444ff475a32e7b0c569e8c3cf05797 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 15 20:17:57 2008 -0600 Rework delta struct and modify code accordingly Start to move the delta struct away from an assumed package name scheme and towards something that is package (or even filename) agnostic. This will allow us much greater flexibility in the usage of deltas (maybe even sync DBs some day) as well as allowing code outside of delta.h/delta.c to be much cleaner with less of a need for snprintf() calls. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ff9744aa1f9d3da380e722fd44a07b8c8a68d101 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Apr 26 11:30:49 2008 +0200 Refactor the trans init and release code. The calls to alpm_trans_init and alpm_trans_release (+ error checking) were duplicated between remove.c, sync.c and upgrade.c This patch introduces trans_init and trans_release functions in util.c to have this code just once. So instead of having to do the same change 3 times for fixing FS#10273, I just had to do it once (so I did it too :)) Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b5a851851cce4ae53e82fdec128ff6d6f73393b Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Apr 21 12:16:15 2008 +0200 Kill compute_requiredby usage in can_remove_package() In the can_remove_package function, we don't need to compute the whole requiredby list, we just need to find one member of it that doesn't belong to the targets list. That way we get a small speedup and remove the only usage of alpm_pkg_compute_requiredby in the backend, so that it can be tweaked for frontend usage. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 6 +- lib/libalpm/delta.c | 311 +++++++++++++++++++++++++-------------------- lib/libalpm/delta.h | 23 +++- lib/libalpm/deps.c | 18 ++-- lib/libalpm/error.c | 2 +- lib/libalpm/graph.h | 1 + lib/libalpm/package.c | 14 +-- lib/libalpm/package.h | 2 + lib/libalpm/sync.c | 334 ++++++++++++++++++++++--------------------------- lib/libalpm/util.c | 4 +- src/pacman/remove.c | 35 ++---- src/pacman/sync.c | 39 ++----- src/pacman/upgrade.c | 34 +---- src/pacman/util.c | 29 ++++- src/pacman/util.h | 2 + 15 files changed, 411 insertions(+), 443 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Refactor the trans init and release code.
by Chantry Xavier 26 Apr '08

26 Apr '08

The calls to alpm_trans_init and alpm_trans_release (+ error checking) were duplicated between remove.c, sync.c and upgrade.c This patch introduces trans_init and trans_release functions in util.c to have this code just once. So instead of having to do the same change 3 times for fixing FS#10273, I just had to do it once (so I did it too :)) Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/remove.c | 35 ++++++++--------------------------- src/pacman/sync.c | 39 ++++++++------------------------------- src/pacman/upgrade.c | 34 +++++++--------------------------- src/pacman/util.c | 28 ++++++++++++++++++++++++++++ src/pacman/util.h | 2 ++ 5 files changed, 53 insertions(+), 85 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 2fb69d3..a2209ac 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -29,24 +29,10 @@ /* pacman */ #include "pacman.h" #include "util.h" -#include "callback.h" #include "conf.h" extern pmdb_t *db_local; -/* Free the current transaction and print an error if unsuccessful */ -static int remove_cleanup(void) -{ - int ret = alpm_trans_release(); - if(ret != 0) { - pm_printf(PM_LOG_ERROR, _("failed to release transaction (%s)\n"), - alpm_strerrorlast()); - ret = 1; - } - - return(ret); -} - /** * @brief Remove a specified list of packages. * @@ -90,14 +76,7 @@ int pacman_remove(alpm_list_t *targets) } /* Step 1: create a new transaction */ - if(alpm_trans_init(PM_TRANS_TYPE_REMOVE, config->flags, - cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { - fprintf(stderr, _("error: failed to init transaction (%s)\n"), - alpm_strerrorlast()); - if(pm_errno == PM_ERR_HANDLE_LOCK) { - printf(_(" if you're sure a package manager is not already\n" - " running, you can remove %s.\n"), alpm_option_get_lockfile()); - } + if(trans_init(PM_TRANS_TYPE_REMOVE, config->flags) == -1) { FREELIST(finaltargs); return(1); } @@ -109,7 +88,7 @@ int pacman_remove(alpm_list_t *targets) if(alpm_trans_addtarget(targ) == -1) { fprintf(stderr, _("error: '%s': %s\n"), targ, alpm_strerrorlast()); - remove_cleanup(); + trans_release(); FREELIST(finaltargs); return(1); } @@ -134,7 +113,7 @@ int pacman_remove(alpm_list_t *targets) default: break; } - remove_cleanup(); + trans_release(); FREELIST(finaltargs); return(1); } @@ -154,7 +133,7 @@ int pacman_remove(alpm_list_t *targets) FREELIST(lst); /* get confirmation */ if(yesno(1, _("\nDo you want to remove these packages?")) == 0) { - remove_cleanup(); + trans_release(); FREELIST(finaltargs); return(1); } @@ -165,13 +144,15 @@ int pacman_remove(alpm_list_t *targets) if(alpm_trans_commit(NULL) == -1) { fprintf(stderr, _("error: failed to commit transaction (%s)\n"), alpm_strerrorlast()); - remove_cleanup(); + trans_release(); FREELIST(finaltargs); return(1); } /* Step 4: release transaction resources */ - retval = remove_cleanup(); + if(trans_release() == -1) { + retval = 1; + } FREELIST(finaltargs); return(retval); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index c074746..77b66da 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -34,7 +34,6 @@ #include "pacman.h" #include "util.h" #include "package.h" -#include "callback.h" #include "conf.h" extern pmdb_t *db_local; @@ -235,34 +234,12 @@ static int sync_cleancache(int level) return(0); } -static int sync_trans_init(pmtransflag_t flags) { - if(alpm_trans_init(PM_TRANS_TYPE_SYNC, flags, cb_trans_evt, - cb_trans_conv, cb_trans_progress) == -1) { - fprintf(stderr, _("error: failed to init transaction (%s)\n"), - alpm_strerrorlast()); - if(pm_errno == PM_ERR_HANDLE_LOCK) { - printf(_(" if you're sure a package manager is not already\n" - " running, you can remove %s.\n"), alpm_option_get_lockfile()); - } - return(-1); - } - return(0); -} - -static int sync_trans_release() { - if(alpm_trans_release() == -1) { - fprintf(stderr, _("error: failed to release transaction (%s)\n"), - alpm_strerrorlast()); - return(-1); - } - return(0); -} static int sync_synctree(int level, alpm_list_t *syncs) { alpm_list_t *i; int success = 0, ret; - if(sync_trans_init(0) == -1) { + if(trans_init(PM_TRANS_TYPE_SYNC, 0) == -1) { return(0); } @@ -281,7 +258,7 @@ static int sync_synctree(int level, alpm_list_t *syncs) } } - if(sync_trans_release() == -1) { + if(trans_release() == -1) { return(0); } /* We should always succeed if at least one DB was upgraded - we may possibly @@ -552,7 +529,7 @@ static int sync_trans(alpm_list_t *targets) alpm_list_t *sync_dbs = alpm_option_get_syncdbs(); /* Step 1: create a new transaction... */ - if(sync_trans_init(config->flags) == -1) { + if(trans_init(PM_TRANS_TYPE_SYNC, config->flags) == -1) { return(1); } @@ -583,10 +560,10 @@ static int sync_trans(alpm_list_t *targets) printf(_(":: pacman has detected a newer version of itself.\n")); if(yesno(1, _(":: Do you want to cancel the current operation\n" ":: and install the new pacman version now?"))) { - if(sync_trans_release() == -1) { + if(trans_release() == -1) { return(1); } - if(sync_trans_init(0) == -1) { + if(trans_init(PM_TRANS_TYPE_SYNC, 0) == -1) { return(1); } if(alpm_trans_addtarget("pacman") == -1) { @@ -788,7 +765,7 @@ cleanup: if(data) { FREELIST(data); } - if(sync_trans_release() == -1) { + if(trans_release() == -1) { retval = 1; } @@ -803,14 +780,14 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_clean) { int ret = 0; - if(sync_trans_init(0) == -1) { + if(trans_init(PM_TRANS_TYPE_SYNC, 0) == -1) { return(1); } ret += sync_cleancache(config->op_s_clean); ret += sync_cleandb_all(); - if(sync_trans_release() == -1) { + if(trans_release() == -1) { ret++; } diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index e562651..589970e 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -28,23 +28,9 @@ /* pacman */ #include "pacman.h" -#include "callback.h" #include "conf.h" #include "util.h" -/* Free the current transaction and print an error if unsuccessful */ -static int upgrade_cleanup(void) -{ - int ret = alpm_trans_release(); - if(ret != 0) { - pm_printf(PM_LOG_ERROR, _("failed to release transaction (%s)\n"), - alpm_strerrorlast()); - ret = 1; - } - - return(ret); -} - /** * @brief Upgrade a specified list of packages. * @@ -78,15 +64,7 @@ int pacman_upgrade(alpm_list_t *targets) } /* Step 1: create a new transaction */ - if(alpm_trans_init(transtype, config->flags, cb_trans_evt, - cb_trans_conv, cb_trans_progress) == -1) { - /* TODO: error messages should be in the front end, not the back */ - fprintf(stderr, _("error: %s\n"), alpm_strerrorlast()); - if(pm_errno == PM_ERR_HANDLE_LOCK) { - /* TODO this and the 2 other places should probably be on stderr */ - printf(_(" if you're sure a package manager is not already\n" - " running, you can remove %s.\n"), alpm_option_get_lockfile()); - } + if(trans_init(transtype, config->flags) == -1) { return(1); } @@ -97,7 +75,7 @@ int pacman_upgrade(alpm_list_t *targets) if(alpm_trans_addtarget(targ) == -1) { fprintf(stderr, _("error: '%s': %s\n"), targ, alpm_strerrorlast()); - upgrade_cleanup(); + trans_release(); return(1); } } @@ -151,7 +129,7 @@ int pacman_upgrade(alpm_list_t *targets) default: break; } - upgrade_cleanup(); + trans_release(); FREELIST(data); return(1); } @@ -160,11 +138,13 @@ int pacman_upgrade(alpm_list_t *targets) /* Step 3: perform the installation */ if(alpm_trans_commit(NULL) == -1) { fprintf(stderr, _("error: failed to commit transaction (%s)\n"), alpm_strerrorlast()); - upgrade_cleanup(); + trans_release(); return(1); } - retval = upgrade_cleanup(); + if(trans_release() == -1) { + retval = 1; + } return(retval); } diff --git a/src/pacman/util.c b/src/pacman/util.c index ed7669a..2cef54f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -42,6 +42,34 @@ /* pacman */ #include "util.h" #include "conf.h" +#include "callback.h" + + +int trans_init(pmtranstype_t type, pmtransflag_t flags) +{ + if(alpm_trans_init(type, flags, cb_trans_evt, + cb_trans_conv, cb_trans_progress) == -1) { + /* TODO: error messages should be in the front end, not the back */ + fprintf(stderr, _("error: failed to init transaction (%s)\n"), + alpm_strerrorlast()); + if(pm_errno == PM_ERR_HANDLE_LOCK) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), alpm_option_get_lockfile()); + } + return(-1); + } + return(0); +} + +int trans_release() +{ + if(alpm_trans_release() == -1) { + fprintf(stderr, _("error: failed to release transaction (%s)\n"), + alpm_strerrorlast()); + return(-1); + } + return(0); +} int needs_transaction() { diff --git a/src/pacman/util.h b/src/pacman/util.h index f2facbf..722e4ab 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -36,6 +36,8 @@ /* update speed for the fill_progress based functions */ #define UPDATE_SPEED_SEC 0.2f +int trans_init(pmtranstype_t type, pmtransflag_t flags); +int trans_release(); int needs_transaction(); int getcols(); int makepath(const char *path); -- 1.5.5.1

3 2

[pacman-dev] [PATCH] Swap the parameters of alpm_pkg_find
by Nagy Gabor 25 Apr '08

25 Apr '08

From eda8bb35123e21b268bdd38b443d4de07e0dd20c Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 21 Apr 2008 12:43:55 +0200 Subject: [PATCH] Swap the parameters of alpm_pkg_find Now the syntax is coherent with alpm_list_find and alpm_sync_find. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/cache.c | 2 +- lib/libalpm/deps.c | 12 ++++++------ lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 4 ++-- lib/libalpm/sync.c | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index 7fa2405..95d7657 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -172,7 +172,7 @@ pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target) return(NULL); } - return(_alpm_pkg_find(target, pkgcache)); + return(_alpm_pkg_find(pkgcache, target)); } /* Returns a new group cache from db. diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 4216e2c..cec69be 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -441,7 +441,7 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, { alpm_list_t *i, *j; - if(_alpm_pkg_find(alpm_pkg_get_name(pkg), targets)) { + if(_alpm_pkg_find(targets, alpm_pkg_get_name(pkg))) { return(0); } @@ -465,7 +465,7 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, 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)) { + if(!_alpm_pkg_find(targets, lpkg->name)) { return(0); } break; @@ -572,8 +572,8 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, if(!sync) { continue; } - found = alpm_depcmp(sync, missdep) && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove) - && !_alpm_pkg_find(alpm_pkg_get_name(sync), *list); + found = alpm_depcmp(sync, missdep) && !_alpm_pkg_find(remove, alpm_pkg_get_name(sync)) + && !_alpm_pkg_find(*list, alpm_pkg_get_name(sync)); if(!found) { continue; } @@ -595,8 +595,8 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, continue; } found = alpm_depcmp(sync, missdep) && strcmp(sync->name, missdep->name) - && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove) - && !_alpm_pkg_find(alpm_pkg_get_name(sync), *list); + && !_alpm_pkg_find(remove, alpm_pkg_get_name(sync)) + && !_alpm_pkg_find(*list, alpm_pkg_get_name(sync)); if(!found) { continue; } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 587e7fc..1ce0194 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1106,7 +1106,7 @@ error: /* Test for existence of a package in a alpm_list_t* * of pmpkg_t* */ -pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack) +pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) { alpm_list_t *lp; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index f3de05d..05b92c7 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -80,7 +80,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package); int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full); -pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack); +pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle); int _alpm_pkg_should_ignore(pmpkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 556d175..3e38c5d 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -57,7 +57,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(_alpm_pkg_find(name, trans->packages)) { + if(_alpm_pkg_find(trans->packages, name)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } @@ -114,7 +114,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) pmdepmissing_t *miss = (pmdepmissing_t *)i->data; pmpkg_t *info = _alpm_db_scan(db, miss->target); if(info) { - if(!_alpm_pkg_find(alpm_pkg_get_name(info), trans->packages)) { + if(!_alpm_pkg_find(trans->packages, alpm_pkg_get_name(info))) { _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", alpm_pkg_get_name(info)); trans->packages = alpm_list_add(trans->packages, info); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5b3087a..7bcd982 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -228,7 +228,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { pmpkg_t *local = i->data; - if(_alpm_pkg_find(alpm_pkg_get_name(local), replaced)) { + if(_alpm_pkg_find(replaced, alpm_pkg_get_name(local))) { _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping\n", alpm_pkg_get_name(local)); continue; @@ -537,7 +537,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync int found = 0; for(j = trans->packages; j && !found; j = j->next) { pmsyncpkg_t *sync = j->data; - if(_alpm_pkg_find(conflict->package2, sync->removes)) { + if(_alpm_pkg_find(sync->removes, conflict->package2)) { found = 1; } } @@ -996,7 +996,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) alpm_list_t *j; for(j = sync->removes; j; j = j->next) { pmpkg_t *pkg = j->data; - if(!_alpm_pkg_find(pkg->name, tr->packages)) { + if(!_alpm_pkg_find(tr->packages, pkg->name)) { if(_alpm_trans_addtarget(tr, pkg->name) == -1) { goto error; } -- 1.5.3.8

2 3

[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