- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Make all error messages use pm_fprintf
by Allan McRae 12 May '08

12 May '08

Tested using many easily generated error conditions. Also added "malloc failure" (conf.c) and "segmentation fault" (pacman.c) error messages for translation Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- src/pacman/conf.c | 2 +- src/pacman/package.c | 7 +++---- src/pacman/pacman.c | 6 +++--- src/pacman/query.c | 15 ++++++++------- src/pacman/remove.c | 6 +++--- src/pacman/sync.c | 44 ++++++++++++++++++++++++++------------------ src/pacman/upgrade.c | 7 ++++--- src/pacman/util.c | 4 ++-- 8 files changed, 50 insertions(+), 41 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index bf3a462..bf3909a 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -33,7 +33,7 @@ config_t *config_new(void) { config_t *newconfig = calloc(1, sizeof(config_t)); if(!newconfig) { - fprintf(stderr, "malloc failure: could not allocate %zd bytes\n", + pm_fprintf(stderr, PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(config_t)); return(NULL); } diff --git a/src/pacman/package.c b/src/pacman/package.c index 76e8e4f..7f587e0 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -195,8 +195,8 @@ void dump_pkg_backups(pmpkg_t *pkg) char *md5sum = alpm_get_md5sum(path); if(md5sum == NULL) { - fprintf(stderr, _("error: could not calculate checksums for %s\n"), - path); + pm_fprintf(stderr, PM_LOG_ERROR, + _("could not calculate checksums for %s\n"), path); free(str); continue; } @@ -245,8 +245,7 @@ void dump_pkg_changelog(pmpkg_t *pkg) void *fp = NULL; if((fp = alpm_pkg_changelog_open(pkg)) == NULL) { - /* TODO after string freeze use pm_fprintf */ - fprintf(stderr, _("error: no changelog available for '%s'.\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("no changelog available for '%s'.\n"), alpm_pkg_get_name(pkg)); return; } else { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 9468d51..53a96cf 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -213,9 +213,9 @@ static RETSIGTYPE handler(int signum) if(signum==SIGSEGV) { /* write a log message and write to stderr */ - pm_printf(PM_LOG_ERROR, "segmentation fault\n"); - pm_fprintf(stderr, PM_LOG_ERROR, "Internal pacman error: Segmentation fault.\n" - "Please submit a full bug report with --debug if appropriate.\n"); + pm_printf(PM_LOG_ERROR, _("segmentation fault\n")); + pm_fprintf(stderr, PM_LOG_ERROR, _("Internal pacman error: Segmentation fault.\n") + _("Please submit a full bug report with --debug if appropriate.\n")); exit(signum); } else if((signum == SIGINT)) { if(alpm_trans_interrupt() == 0) { diff --git a/src/pacman/query.c b/src/pacman/query.c index 0b6ce0c..74d3ff2 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -62,7 +62,7 @@ static int query_fileowner(alpm_list_t *targets) /* This code is here for safety only */ if(targets == NULL) { - fprintf(stderr, _("error: no file was specified for --owns\n")); + pm_fprintf(stderr, PM_LOG_ERROR, _("no file was specified for --owns\n")); return(1); } @@ -75,14 +75,15 @@ static int query_fileowner(alpm_list_t *targets) alpm_list_t *i, *j; if(stat(filename, &buf) == -1) { - fprintf(stderr, _("error: failed to read file '%s': %s\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), filename, strerror(errno)); ret++; continue; } if(S_ISDIR(buf.st_mode)) { - fprintf(stderr, _("error: cannot determine ownership of a directory\n")); + pm_fprintf(stderr, PM_LOG_ERROR, + _("cannot determine ownership of a directory\n")); ret++; continue; } @@ -93,7 +94,7 @@ static int query_fileowner(alpm_list_t *targets) free(dname); if(!rpath) { - fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), filename, strerror(errno)); free(rpath); ret++; @@ -133,7 +134,7 @@ static int query_fileowner(alpm_list_t *targets) } } if(!found) { - fprintf(stderr, _("error: No package owns %s\n"), filename); + pm_fprintf(stderr, PM_LOG_ERROR, _("No package owns %s\n"), filename); ret++; } free(rpath); @@ -237,7 +238,7 @@ static int query_group(alpm_list_t *targets) printf("%s %s\n", grpname, alpm_pkg_get_name(alpm_list_getdata(p))); } } else { - fprintf(stderr, _("error: group \"%s\" was not found\n"), grpname); + pm_fprintf(stderr, PM_LOG_ERROR, _("group \"%s\" was not found\n"), grpname); ret++; } } @@ -415,7 +416,7 @@ int pacman_query(alpm_list_t *targets) } if(pkg == NULL) { - fprintf(stderr, _("error: package \"%s\" not found\n"), strname); + pm_fprintf(stderr, PM_LOG_ERROR, _("package \"%s\" not found\n"), strname); ret++; continue; } diff --git a/src/pacman/remove.c b/src/pacman/remove.c index a2209ac..4fe9bc8 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -86,7 +86,7 @@ int pacman_remove(alpm_list_t *targets) for(i = finaltargs; i; i = alpm_list_next(i)) { char *targ = alpm_list_getdata(i); if(alpm_trans_addtarget(targ) == -1) { - fprintf(stderr, _("error: '%s': %s\n"), + pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ, alpm_strerrorlast()); trans_release(); FREELIST(finaltargs); @@ -96,7 +96,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 2: prepare the transaction based on its type, targets and flags */ if(alpm_trans_prepare(&data) == -1) { - fprintf(stderr, _("error: failed to prepare transaction (%s)\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { case PM_ERR_UNSATISFIED_DEPS: @@ -142,7 +142,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 3: actually perform the removal */ if(alpm_trans_commit(NULL) == -1) { - fprintf(stderr, _("error: failed to commit transaction (%s)\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); trans_release(); FREELIST(finaltargs); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3c6dfd5..a41b79e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -46,7 +46,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) { dir = opendir(dbpath); if(dir == NULL) { - fprintf(stderr, _("error: could not access database directory\n")); + pm_fprintf(stderr, PM_LOG_ERROR, _("could not access database directory\n")); return(1); } @@ -90,7 +90,8 @@ static int sync_cleandb(const char *dbpath, int keep_used) { } if(rmrf(path)) { - fprintf(stderr, _("error: could not remove repository directory\n")); + pm_fprintf(stderr, PM_LOG_ERROR, + _("could not remove repository directory\n")); return(1); } } @@ -151,7 +152,7 @@ static int sync_cleancache(int level) dir = opendir(cachedir); if(dir == NULL) { - fprintf(stderr, _("error: could not access cache directory\n")); + pm_fprintf(stderr, PM_LOG_ERROR, _("could not access cache directory\n")); return(1); } @@ -220,12 +221,12 @@ static int sync_cleancache(int level) printf(_("removing all packages from cache... ")); if(rmrf(cachedir)) { - fprintf(stderr, _("error: could not remove cache directory\n")); + pm_fprintf(stderr, PM_LOG_ERROR, _("could not remove cache directory\n")); return(1); } if(makepath(cachedir)) { - fprintf(stderr, _("error: could not create new cache directory\n")); + pm_fprintf(stderr, PM_LOG_ERROR, _("could not create new cache directory\n")); return(1); } printf(_("done.\n")); @@ -248,7 +249,7 @@ static int sync_synctree(int level, alpm_list_t *syncs) ret = alpm_db_update((level < 2 ? 0 : 1), db); if(ret < 0) { - fprintf(stderr, _("error: failed to update %s (%s)\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to update %s (%s)\n"), alpm_db_get_name(db), alpm_strerrorlast()); } else if(ret == 1) { printf(_(" %s is up to date\n"), alpm_db_get_name(db)); @@ -266,7 +267,7 @@ static int sync_synctree(int level, alpm_list_t *syncs) * expected */ if(!success) { - fprintf(stderr, _("error: failed to synchronize any databases\n")); + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to synchronize any databases\n")); } return(success > 0); } @@ -418,7 +419,8 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) } if(!db) { - fprintf(stderr, _("error: repository '%s' does not exist\n"), repo); + pm_fprintf(stderr, PM_LOG_ERROR, + _("repository '%s' does not exist\n"), repo); return(1); } @@ -433,7 +435,8 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) } if(!foundpkg) { - fprintf(stderr, _("error: package '%s' was not found in repository '%s'\n"), pkgstr, repo); + pm_fprintf(stderr, PM_LOG_ERROR, + _("package '%s' was not found in repository '%s'\n"), pkgstr, repo); ret++; } } else { @@ -453,7 +456,8 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) } } if(!foundpkg) { - fprintf(stderr, _("error: package '%s' was not found\n"), pkgstr); + pm_fprintf(stderr, PM_LOG_ERROR, + _("package '%s' was not found\n"), pkgstr); ret++; } } @@ -490,7 +494,8 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) } if(db == NULL) { - fprintf(stderr, _("error: repository \"%s\" was not found.\n"),repo); + pm_fprintf(stderr, PM_LOG_ERROR, + _("repository \"%s\" was not found.\n"),repo); alpm_list_free(ls); return(1); } @@ -538,7 +543,7 @@ static int sync_trans(alpm_list_t *targets) printf(_(":: Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade\n"); if(alpm_trans_sysupgrade() == -1) { - fprintf(stderr, _("error: %s\n"), alpm_strerrorlast()); + pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); retval = 1; goto cleanup; } @@ -567,7 +572,8 @@ static int sync_trans(alpm_list_t *targets) return(1); } if(alpm_trans_addtarget("pacman") == -1) { - fprintf(stderr, _("error: pacman: %s\n"), alpm_strerrorlast()); + pm_fprintf(stderr, PM_LOG_ERROR, _("pacman: %s\n"), + alpm_strerrorlast()); return(1); } break; @@ -591,7 +597,7 @@ static int sync_trans(alpm_list_t *targets) continue; } if(pm_errno != PM_ERR_PKG_NOT_FOUND) { - fprintf(stderr, _("error: '%s': %s\n"), + pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ, alpm_strerrorlast()); retval = 1; goto cleanup; @@ -647,7 +653,8 @@ static int sync_trans(alpm_list_t *targets) targets = alpm_list_add(targets, strdup(pname)); } else { alpm_list_t *k; - fprintf(stderr, _("error: several packages provide %s, please specify one :\n"), targ); + pm_fprintf(stderr, PM_LOG_ERROR, + _("several packages provide %s, please specify one :\n"), targ); for(k = prov; k; k = alpm_list_next(k)) { pmpkg_t *pkg = alpm_list_getdata(k); printf("%s ", alpm_pkg_get_name(pkg)); @@ -658,7 +665,8 @@ static int sync_trans(alpm_list_t *targets) goto cleanup; } } else { - fprintf(stderr, _("error: '%s': not found in sync db\n"), targ); + pm_fprintf(stderr, PM_LOG_ERROR, + _("'%s': not found in sync db\n"), targ); retval = 1; goto cleanup; } @@ -669,7 +677,7 @@ static int sync_trans(alpm_list_t *targets) /* Step 2: "compute" the transaction based on targets and flags */ if(alpm_trans_prepare(&data) == -1) { - fprintf(stderr, _("error: failed to prepare transaction (%s)\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { alpm_list_t *i; @@ -722,7 +730,7 @@ static int sync_trans(alpm_list_t *targets) /* Step 3: actually perform the installation */ if(alpm_trans_commit(&data) == -1) { - fprintf(stderr, _("error: failed to commit transaction (%s)\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { alpm_list_t *i; diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 589970e..927f1f4 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -73,7 +73,7 @@ int pacman_upgrade(alpm_list_t *targets) for(i = targets; i; i = alpm_list_next(i)) { char *targ = alpm_list_getdata(i); if(alpm_trans_addtarget(targ) == -1) { - fprintf(stderr, _("error: '%s': %s\n"), + pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ, alpm_strerrorlast()); trans_release(); return(1); @@ -83,7 +83,7 @@ int pacman_upgrade(alpm_list_t *targets) /* Step 2: "compute" the transaction based on targets and flags */ /* TODO: No, compute nothing. This is stupid. */ if(alpm_trans_prepare(&data) == -1) { - fprintf(stderr, _("error: failed to prepare transaction (%s)\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { case PM_ERR_UNSATISFIED_DEPS: @@ -137,7 +137,8 @@ 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()); + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), + alpm_strerrorlast()); trans_release(); return(1); } diff --git a/src/pacman/util.c b/src/pacman/util.c index f1f098f..2e4ee86 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -49,7 +49,7 @@ 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) { - fprintf(stderr, _("error: failed to init transaction (%s)\n"), + pm_fprintf(stderr, PM_LOG_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" @@ -63,7 +63,7 @@ int trans_init(pmtranstype_t type, pmtransflag_t flags) int trans_release() { if(alpm_trans_release() == -1) { - fprintf(stderr, _("error: failed to release transaction (%s)\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to release transaction (%s)\n"), alpm_strerrorlast()); return(-1); } -- 1.5.5.1

3 3

[pacman-dev] [PATCH] Tidy up missing changelog error message
by Allan McRae 11 May '08

11 May '08

Removes a small TODO from the codebase Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- src/pacman/package.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 76e8e4f..6f4a195 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -245,8 +245,7 @@ void dump_pkg_changelog(pmpkg_t *pkg) void *fp = NULL; if((fp = alpm_pkg_changelog_open(pkg)) == NULL) { - /* TODO after string freeze use pm_fprintf */ - fprintf(stderr, _("error: no changelog available for '%s'.\n"), + pm_fprintf(stderr, PM_LOG_ERROR, "no changelog available for '%s'.\n", alpm_pkg_get_name(pkg)); return; } else { -- 1.5.5.1

3 5

[pacman-dev] [PATCH] Add detailed description to alpm_pkg_load
by Sebastian Nowicki 10 May '08

10 May '08

It was unclear what "loading the full package" actually did. The detailed description should clear that up, without having to look at the code. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- lib/libalpm/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ffaa96b..32ff3a8 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -54,6 +54,9 @@ */ /** Create a package from a file. + * If full is false, the archive is read only until all necessary + * metadata is found. If it is true, the entire archive is read, which + * serves as a verfication of integrity and the filelist can be created. * @param filename location of the package tarball * @param full whether to stop the load after metadata is read or continue * through the full archive -- 1.5.4.5

2 1

[pacman-dev] [PATCH] Restore .pacsave file if present
by Allan McRae 10 May '08

10 May '08

This patch adds the ability to restore file "foo.pacsave" when installing file "foo". File "foo" is then installed as "foo.pacnew" I really need help with this one. I am a bit wary of this code given it is in one of the most essential parts of pacman. Despite the new pactest failure, I actually had the balls to test this out on my production system... Using the abs package and the /etc/abs.conf.pacsave file is restored and /etc/abs.conf.pacnew is created as expected. TODO: Query users about restore Remove .paccheck from file name in warning about .pacnew creation Figure out why pactest upgrade025 now fails Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- lib/libalpm/add.c | 87 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 66 insertions(+), 21 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 3389893..453d5a7 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -333,6 +333,33 @@ static int extract_single_file(struct archive *archive, return(0); } + /* if file does not exist, check for a .pacsave file to restore */ + struct stat lsbuf, sbuf; + int filename_lstat, filename_stat, pacsaverestore = 0; + + char pacsavefile[PATH_MAX]; + snprintf(pacsavefile, PATH_MAX, "%s.pacsave", filename); + + filename_lstat = _alpm_lstat(filename, &lsbuf); + filename_stat = stat(filename, &sbuf); + if(filename_lstat != 0 || filename_stat != 0) { + struct stat pslsbuf; + if(_alpm_lstat(pacsavefile, &pslsbuf) == 0) { + + /* TODO: query or notify about pacsave restore */ + + if(rename(pacsavefile, filename)) { + _alpm_log(PM_LOG_ERROR, _("could not rename %s (%s)\n"), pacsavefile, strerror(errno)); + alpm_logaction("error: could not rename %s (%s)\n", pacsavefile, strerror(errno)); + errors++; + } else { + pacsaverestore = 1; + filename_lstat = _alpm_lstat(filename, &lsbuf); + filename_stat = stat(filename, &sbuf); + } + } + } + /* Check for file existence. This is one of the more crucial parts * to get 'right'. Here are the possibilities, with the filesystem * on the left and the package on the top: @@ -354,8 +381,7 @@ static int extract_single_file(struct archive *archive, */ /* do both a lstat and a stat, so we can see what symlinks point to */ - struct stat lsbuf, sbuf; - if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) { + if(filename_lstat != 0 || filename_stat != 0) { /* cases 1,2,3: couldn't stat an existing file, skip all backup checks */ } else { if(S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) { @@ -492,31 +518,50 @@ static int extract_single_file(struct archive *archive, if(!oldpkg) { /* looks like we have a local file that has a different hash as the - * file in the package, move it to a .pacorig */ + * file in the package, move it to a .pacorig if it has not been restored + * from a pacsave file, else write the package file to .pacnew */ if(strcmp(hash_local, hash_pkg) != 0) { - char newpath[PATH_MAX]; - snprintf(newpath, PATH_MAX, "%s.pacorig", filename); + if(pacsaverestore == 0) { + char newpath[PATH_MAX]; + snprintf(newpath, PATH_MAX, "%s.pacorig", filename); - /* move the existing file to the "pacorig" */ - if(rename(filename, newpath)) { - _alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), - filename, newpath, strerror(errno)); - alpm_logaction("error: could not rename %s to %s (%s)\n", - filename, newpath, strerror(errno)); - errors++; - } else { - /* rename the file we extracted to the real name */ - if(rename(checkfile, filename)) { + /* move the existing file to the "pacorig" */ + if(rename(filename, newpath)) { _alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), - checkfile, filename, strerror(errno)); + filename, newpath, strerror(errno)); alpm_logaction("error: could not rename %s to %s (%s)\n", - checkfile, filename, strerror(errno)); + filename, newpath, strerror(errno)); errors++; } else { - _alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath); - alpm_logaction("warning: %s saved as %s\n", filename, newpath); + /* rename the file we extracted to the real name */ + if(rename(checkfile, filename)) { + _alpm_log(PM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), + checkfile, filename, strerror(errno)); + alpm_logaction("error: could not rename %s to %s (%s)\n", + checkfile, filename, strerror(errno)); + errors++; + } else { + _alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath); + alpm_logaction("warning: %s saved as %s\n", filename, newpath); + } } - } + } else { /* .pacsave file was restored */ + char newpath[PATH_MAX]; + _alpm_log(PM_LOG_DEBUG, "action: keeping current file and installing" + " new one with .pacnew ending\n"); + snprintf(newpath, PATH_MAX, "%s.pacnew", filename); + if(rename(checkfile, newpath)) { + _alpm_log(PM_LOG_ERROR, _("could not install %s as %s: %s\n"), + checkfile, newpath, strerror(errno)); + alpm_logaction("error: could not install %s as %s: %s\n", + checkfile, newpath, strerror(errno)); + } else { + _alpm_log(PM_LOG_WARNING, _("%s installed as %s\n"), + checkfile, newpath); + alpm_logaction("warning: %s installed as %s\n", + checkfile, newpath); + } + } } } else if(hash_orig) { /* the fun part */ -- 1.5.5.1

2 2

[pacman-dev] Libraries for makepkg
by Allan McRae 10 May '08

10 May '08

What are peoples opinions on adding some libraries to makepkg that would quickly achieve some common tasks (http://bugs.archlinux.org/task/10375)? I think this is a trade of between the ease of interpretation of a single command and understanding what that command actually does. The need to import the function before use makes me lean on the side of including these. If we go for this, I would recommend some fairly strict guidelines on their inclusion. e.g. 1) The function must be a command block in common use or have a good case made for why it will be in the future. 2) The function must be significantly complex so that using it helps with interpretation of the PKGBUILD. I can think of one function which would save a lot of discussion around here: create_desktop_file(<progname>, <description>, <category>) Allan

6 8

[pacman-dev] List packages from a given repo
by Allan McRae 10 May '08

10 May '08

Hi, I attach a script tentatively called "repopkg" that lists all packages installed from a given repo. I find this useful for monitoring what I have installed from [testing]. It is not entirely fool proof as it assumes you have installed packages using "pacman -S pkg" and not "pacman -S repo/pkg". A couple of queries. Can someone come up with a better name which is not too long? And any comments before I submit the for inclusion in the contrib directory (it is best to come as a git patch right?). Cheers, Allan #!/bin/bash # repopkg - List all packages installed from a given repo # # Copyright (C) 2008 Allan McRae <mcrae_allan(a)hotmail.com> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # TODO: Could match version numbers to catch packages # install with pacman -S repo/pkg readonly progname="repopkg" readonly version="1.0" if [ -z "$1" -o "$1" = "--help" -o "$1" = "-h" ]; then echo "Usage: $progname <repo>" echo "Ex: $progname testing" exit 0 fi if [ "$1" = "--version" -o "$1" = "-v" ]; then echo "$progname version $version" echo "Copyright (C) 2008 Allan McRae" exit 0 fi pkglist=$(mktemp) pacman -Sl > $pkglist for pkg in $(pacman -Qq); do match=$(grep -m1 " $pkg " $pkglist | grep "^$1") if [ -n "${match}" ]; then echo $pkg fi done rm $pkglist

5 12

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-142-gb49fc50
by Dan McGee 10 May '08

10 May '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 b49fc504acffa470cce31fb889723ecd86b314de (commit) via 2edd01a973f9695b6bb918ccdbaabd004058f578 (commit) via 502645c0e304a8ee062d8da7f162ff4c195e6be8 (commit) from df5024fd64de5b033ed76d3ea347a1126572cbc3 (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 b49fc504acffa470cce31fb889723ecd86b314de Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 18:39:22 2008 -0500 Update makepath to remove PATH_MAX usage The start of a few commits to remove some PATH_MAX usage from our code. Use a dynamically allocated string instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2edd01a973f9695b6bb918ccdbaabd004058f578 Author: Dan McGee <dan(a)archlinux.org> Date: Fri May 9 19:26:57 2008 -0500 scripts: add -q/--quiet option to repo-add and repo-remove They are pretty noisy scripts in their normal course of operations, so allow all messages to be squashed except for warning and error messages with this new flag. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 502645c0e304a8ee062d8da7f162ff4c195e6be8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 8 21:48:44 2008 -0500 makepkg: Unify start and end messages I've always found it odd why the package version is shown at the start but not the end of the package build. Fix it, and while we are at it, add the $CARCH variable to the display too. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/repo-add.8.txt | 11 +++++++++-- lib/libalpm/util.c | 38 +++++++++++++++++++++----------------- scripts/makepkg.sh.in | 4 ++-- scripts/repo-add.sh.in | 16 ++++++++++++---- scripts/repo-remove.sh.in | 16 ++++++++++++---- src/pacman/util.c | 35 ++++++++++++++++++++--------------- 6 files changed, 76 insertions(+), 44 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] contrib/paclist - list packages installed from given repo
by Allan McRae 09 May '08

09 May '08

The paclist script provides a simple method for monitoring which packages are installed from a given repo. This is particularly useful when using a testing or unstable repository. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- contrib/paclist | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 contrib/paclist diff --git a/contrib/paclist b/contrib/paclist new file mode 100644 index 0000000..87592a5 --- /dev/null +++ b/contrib/paclist @@ -0,0 +1,51 @@ +#!/bin/bash +# paclist - List all packages installed from a given repo +# +# Copyright (C) 2008 Allan McRae <mcrae_allan(a)hotmail.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + + +readonly progname="paclist" +readonly version="1.0" + +if [ -z "$1" -o "$1" = "--help" -o "$1" = "-h" ]; then + echo "$progname - List all packages installed from a given repo" + echo "Usage: $progname <repo>" + echo "Example: $progname testing" + exit 0 +fi + +if [ "$1" = "--version" -o "$1" = "-v" ]; then + echo "$progname version $version" + echo "Copyright (C) 2008 Allan McRae" + exit 0 +fi + +pkglist=$(mktemp) +ret=0 +pacman -Sl $1 > $pkglist || ret=$? +if [ $ret -ne 0 ]; then + exit 1 +fi + +pacman -Q | while read pkg; do + ret=0 + grep -q "$pkg" $pkglist || ret=$? + if [ $ret -eq 0 ]; then + echo $pkg + fi +done + +rm $pkglist -- 1.5.5.1

2 3

[pacman-dev] pm_transflag enum
by Dario Freddi 09 May '08

09 May '08

Thanks Aaron, Casts were the right thing to do, though this is the right way to cast (the only one I found that actually works): flags = (pmtransflag_t) ((pmtransflag_t)flags | (pmtransflag_t)PM_TRANS_FLAG_FORCE); Thanks for your help! Cheers Dario

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-139-gdf5024f
by Dan McGee 09 May '08

09 May '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 df5024fd64de5b033ed76d3ea347a1126572cbc3 (commit) via 081ba4816ee90e59be31a14da6e7ac2ea5a10db8 (commit) via 7fccfc78195f257e907ff4f04294ef743559017a (commit) via a13bf7497948b27786a1d568264d91b8fa60491b (commit) from 5389cdf65431e6daf219b9bb8f8985c6c33b1996 (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 df5024fd64de5b033ed76d3ea347a1126572cbc3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 20:51:04 2008 -0500 Use strdup() instead of a static buffer We only need a copy of this string once we know we are going to extract it, and we don't need a static buffer to copy it into since it is coming from a known-length string. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 081ba4816ee90e59be31a14da6e7ac2ea5a10db8 Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 20:48:32 2008 -0500 Update md5 routines XySSL 0.9 was released; sync our code with the upstream source. Note that there weren't any real changes besides renaming of macros, so nothing much to see here. The biggest change may be the licence- it is now GPL/BSD software rather than LGPL/BSD. The license header is changed to reflect this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fccfc78195f257e907ff4f04294ef743559017a Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 19:34:03 2008 -0500 be_files.c: PATH_MAX cleanup Most of these are not easy to remove, but I could kill the ones in the two lastupdate functions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a13bf7497948b27786a1d568264d91b8fa60491b Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 4 19:15:49 2008 -0500 pacman-side code cleanups When taking a look at PATH_MAX usage, I found a few small things we can clean up or fix. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 38 +++++++++++++-------- lib/libalpm/be_files.c | 19 +++++++--- lib/libalpm/md5.c | 86 +++++++++++++++++++++++------------------------ lib/libalpm/md5.h | 29 +++++----------- src/pacman/package.c | 7 +--- src/pacman/query.c | 9 +++-- src/pacman/sync.c | 4 +- 7 files changed, 97 insertions(+), 95 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pm_transflag enum
by Dario Freddi 08 May '08

08 May '08

Hello, I know this might look as a stupid question, though I can't manage to use multiple flags, just as pacman does. This bunch of code: pmtransflag_t flgs = PM_TRANS_FLAG_NOSCRIPTLET; flgs |= PM_TRANS_FLAG_FORCE; Simply doesn't compile, returning: /home/drf/Development/shaman/trunk/shaman/src/AlpmHandler.cpp: In member function ‘bool AlpmHandler::initTransaction(pmtranstype_t, pmtransflag_t, bool)’: /home/drf/Development/shaman/trunk/shaman/src/AlpmHandler.cpp:155: error: invalid conversion from ‘int’ to ‘pmtransflag_t’ Though, pacman just does it this way, so I can't get where I am wrong. Any help would be appreciated. Cheers Dario

2 1

[pacman-dev] makepkg -b is wrong
by Diogo Dutra 07 May '08

07 May '08

Hi guys, I have found a bug in makepkg, the makepkg -b dont install builded packages as depencies, it install as explicited packages and it is not good, I make a patch that revolve this problem. Im sorry for any mistakes of mine.

6 15

[pacman-dev] Conditional dependencies
by Nagy Gabor 05 May '08

05 May '08

Hi! This may be a crazy idea, but I bring this on. I've read some bugs on bug tracker, and I saw that "your kernel is too old" sometimes. The problem is, that many users use custom kernel (like me), that's why we cannot add 'kernel26>=...' dependency to glibc for example. However, some users use arch-built kernel, and they may break their system after installing a new glibc (well, at least a warning in .install file would be helpful here). So as a compromise, we could introduce a new type of dependency which can be satisfied iff the user has no package (provision) installed defined by dependency-name (and he gets a warning similar to the helpful .install script) or it is installed the dependency is satisfied treated as normal dependency. Thus a glibc update would force a kernel update if needed but would never force kernel _add_. Bye

3 4

[pacman-dev] Incoherent alpm_list_t usage in deps.c
by Nagy Gabor 03 May '08

03 May '08

Hi! Both resolvedeps and recursedeps populates its input list; however, resolvedeps has alpm_list_t**, recursedeps has alpm_list_t* param. First I thought that the return value of alpm_list_add is needless, since we add the new element to the end of the list. But, when the list is empty (thus the passed param is NULL), the return value is important. Neither of the mentioned functions should populate its input list, if it is empty; so both * and ** seems to be correct (however, by definition, resolvedeps could populate an empty list, but - after DEPENDSONLY removal - syncpkg is always a member of *list). Bye

2 1

[pacman-dev] [PATCH] One liner _alpm_pkg_find
by Nagy Gabor 01 May '08

01 May '08

From f08d8647274fc2c582005f9f0baebc114b2829cd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 2 May 2008 00:32:45 +0200 Subject: [PATCH] One liner _alpm_pkg_find This patch kills some code duplication. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/package.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ab49492..313c84a 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1095,22 +1095,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

1 0

[pacman-dev] [PATCH] Swap the parameters of alpm_pkg_find (resubmit)
by Nagy Gabor 01 May '08

01 May '08

From 6a15dd711a033609ad6ac007f8c55ac1ce045206 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 1 May 2008 23:58:33 +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 bfc4fd9..77cd292 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -171,7 +171,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 b171ccc..9cae0e2 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -440,7 +440,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); } @@ -464,7 +464,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; @@ -571,8 +571,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; } @@ -594,8 +594,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 ffaa96b..ab49492 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1093,7 +1093,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 0ba8aac..99cd47d 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -82,7 +82,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 f2e84ef..c70e2b9 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -56,7 +56,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); } @@ -92,7 +92,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, 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)) { + 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, _alpm_pkg_dup(info)); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 357b01f..3743f9b 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -227,7 +227,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; @@ -583,7 +583,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; } } @@ -954,7 +954,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 1

[pacman-dev] [PATCH] Unify the order of alpm_list_fn_cmp parameters
by Nagy Gabor 01 May '08

01 May '08

From 82de17753e8be6c125781e331cd8b526876008fb Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 2 May 2008 00:25:08 +0200 Subject: [PATCH] Unify the order of alpm_list_fn_cmp parameters In some cases we pass tricky asymmetric alpm_list_fn_cmp functions to alpm_list_find and alpm_list_remove, and the order of parameters wasn't coherent. 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 +- 3 files changed, 3 insertions(+), 3 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 e8ae11a..bc11ad7 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -627,7 +627,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 9cae0e2..bbc8cd5 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -195,7 +195,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)); } -- 1.5.3.8

1 0

[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