- Pacman-dev - lists.archlinux.org

[pacman-dev] Bug with rxvt-unicode version check
by bardo 28 Nov '07

28 Nov '07

Hi all. I'm experiencing a strange problem: rxvt-unicode should be upgraded from 8.4-1 to 8.5a-1, but when it comes the time of checking if the package has been cached, 8.4-1 is marked as a match, and gets installed instead of the new version. I can reproduce this whenever I want, since pacman tries to upgrade rxvt-unicode with every -Su. The relevant part of pacman -Syu --debug is attached, I can upload the whole log if needed (~750KB). Corrado

5 10

[pacman-dev] [PATCH] Optimize string comparison on 1 character compare
by Dan McGee 27 Nov '07

27 Nov '07

No need to do strcmp when we can check for direct equality, but is it worth the optimization? Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_files.c | 4 ++-- lib/libalpm/util.c | 2 +- src/pacman/sync.c | 4 ++-- src/pacman/util.c | 2 +- src/util/testdb.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 078136e..74932d2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -170,7 +170,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) /* search for a specific package (by name only) */ rewinddir(db->handle); while(!found && (ent = readdir(db->handle)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* stat the entry, make sure it's a directory */ @@ -201,7 +201,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) if(ent == NULL) { return(NULL); } - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { isdir = 0; continue; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2a42948..3ce1f04 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -463,7 +463,7 @@ int _alpm_rmrf(const char *path) for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") && *(dp->d_name) != '.') { errflag += _alpm_rmrf(name); } } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 58e616e..e9c16f5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -61,7 +61,7 @@ static int sync_cleandb(const char *dbpath) { int found = 0; char *dname = ent->d_name; - if(!strcmp(dname, ".") || !strcmp(dname, "..")) { + if(*dname == '.' || !strcmp(dname, "..")) { continue; } /* skip the local and sync directories */ @@ -145,7 +145,7 @@ static int sync_cleancache(int level) char path[PATH_MAX]; pmpkg_t *localpkg = NULL, *dbpkg = NULL; - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* build the full filepath */ diff --git a/src/pacman/util.c b/src/pacman/util.c index a925be3..5025b3f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -154,7 +154,7 @@ int rmrf(const char *path) if(dp->d_ino) { char name[PATH_MAX]; sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") && *(dp->d_name) != '.') { errflag += rmrf(name); } } diff --git a/src/util/testdb.c b/src/util/testdb.c index 31b4ff0..c3f86d8 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -75,7 +75,7 @@ static int db_test(char *dbpath) } while ((ent = readdir(dir)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* check for desc, depends, and files */ -- 1.5.3.6

3 3

[pacman-dev] [PATCH] Unify dump_pkg_full in pacman [-Si, -Qip, -Qi and -Qii]
by Nagy Gabor 27 Nov '07

27 Nov '07

Patch attached. Notes: 1. 'Compressed size' is ugly [too long, no space before :], improvements welcome 2. The following commit is misleading in case of sync packages (isize == 0 means isize is not filled in, not isize == csize): http://projects.archlinux.org/git/? p=pacman.git;a=commit;h=5e12d3dec99e7a506683cf625fa4344f57df0b77 Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] [PATCH] Fix several memleaks, mostly related to errors handling.
by Chantry Xavier 26 Nov '07

26 Nov '07

* The frontend calls alpm_trans_prepare(&data), and in case of errors, receive the missing dependencies / conflicts / etc in the data pointer. It apparently needs to free this structure totally with : alpm_list_free_inner(data, free) alpm_list_free(data) So I added alpm_list_free_inner(data, free) in pacman/{sync.c,remove.c,add,c} * in _alpm_sync_prepare, the deps and asked lists were not freed in case of errors (unresolvable conflicts). Besides the code for handling this case was duplicated. * in _alpm_remove_commit, free was used instead of alpm_list_free for newfiles. * newline fix in pacman/sync.c Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/remove.c | 2 +- lib/libalpm/sync.c | 42 ++++++++++++++++++------------------------ src/pacman/add.c | 1 + src/pacman/remove.c | 1 + src/pacman/sync.c | 3 ++- 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 592cf39..e1f19ec 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -315,7 +315,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) (pkg_count - alpm_list_count(targ) + 1)); position++; } - free(newfiles); + alpm_list_free(newfiles); } /* set progress to 100% after we finish unlinking files */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f03a78b..b49bbfb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -496,12 +496,13 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync if(deps) { int errorout = 0; alpm_list_t *asked = NULL; + pmconflict_t *conflict = NULL; for(i = deps; i && !errorout; i = i->next) { - pmconflict_t *conflict = i->data; pmsyncpkg_t *sync; pmpkg_t *found = NULL; + conflict = i->data; _alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", conflict->package1, conflict->package2); /* check if the conflicting package is about to be removed/replaced. @@ -614,42 +615,35 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync /* abort */ _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); errorout = 1; - if(data) { - if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { - _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(pmconflict_t)); - FREELIST(*data); - pm_errno = PM_ERR_MEMORY; - ret = -1; - goto cleanup; - } - *conflict = *(pmconflict_t *)i->data; - *data = alpm_list_add(*data, conflict); - } } } } else { _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); errorout = 1; - if(data) { - if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { - _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(pmconflict_t)); - FREELIST(*data); - pm_errno = PM_ERR_MEMORY; - ret = -1; - goto cleanup; - } - *conflict = *(pmconflict_t *)i->data; - *data = alpm_list_add(*data, conflict); - } } } if(errorout) { + /* The last conflict was unresolvable, so we duplicate it and add it to *data */ pm_errno = PM_ERR_CONFLICTING_DEPS; + if(data) { + pmconflict_t *lastconflict = conflict; + if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), + sizeof(pmconflict_t)); + FREELIST(*data); + pm_errno = PM_ERR_MEMORY; + } else { + *conflict = *lastconflict; + *data = alpm_list_add(*data, conflict); + } + } + FREELIST(asked); + FREELIST(deps); ret = -1; goto cleanup; } - FREELIST(deps); FREELIST(asked); + FREELIST(deps); } EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL); } diff --git a/src/pacman/add.c b/src/pacman/add.c index 7d18749..e04707f 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -175,6 +175,7 @@ int pacman_add(alpm_list_t *targets) break; } add_cleanup(); + alpm_list_free_inner(data, free); alpm_list_free(data); return(1); } diff --git a/src/pacman/remove.c b/src/pacman/remove.c index e1e4f04..1028d9e 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -133,6 +133,7 @@ int pacman_remove(alpm_list_t *targets) depstring); free(depstring); } + alpm_list_free_inner(data, free); alpm_list_free(data); break; default: diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 41d18a9..889c682 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -621,7 +621,7 @@ int sync_trans(alpm_list_t *targets, int sync_only) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmconflict_t *conflict = alpm_list_getdata(i); - printf(_(":: %s: conflicts with %s"), + printf(_(":: %s: conflicts with %s\n"), alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); } break; @@ -706,6 +706,7 @@ int sync_trans(alpm_list_t *targets, int sync_only) /* Step 4: release transaction resources */ cleanup: if(data) { + alpm_list_free_inner(data, free); alpm_list_free(data); } if(alpm_trans_release() == -1) { -- 1.5.3.6

5 9

[pacman-dev] [PATCH] pacman/query.c : -Qo optimization.
by Chantry Xavier 26 Nov '07

26 Nov '07

I didn't understand why realpath was called on every files of every filelist in query_fileowner : ppath = resolve_path(path); It turns out this is needed for the diverted files. For example, cddb_get installs /usr/lib/perl5/site_perl/5.8.8/CDDB_get.pm which actually ends in /usr/lib/perl5/site_perl/current/CDDB_get.pm . And for making pacman -Qo /usr/lib/perl5/site_perl/current/CDDB_get.pm , realpath has to be called on both the target, and the file in the filelist. However, realpath is costly, and calling it on every single file resulted in a poor -Qo performance. Worst case : pacman -Qo /lib/libz.so.1 0.35s user 1.51s system 99% cpu 1.864 total So I did a little optimization to avoid calling realpath as much as possible: first compare the basename of each file. Result: src/pacman/pacman -Qo /lib/libz.so.1 0.24s user 0.05s system 99% cpu 0.298 total Obviously, the difference will be even bigger at the first run (no fs cache), though it's quite scary on my system : 1.7s vs 40s previously. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/query.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index bb69527..7989756 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -71,6 +71,7 @@ static int query_fileowner(alpm_list_t *targets) for(t = targets; t; t = alpm_list_next(t)) { int found = 0; char *filename = alpm_list_getdata(t); + char *bname; char *rpath; struct stat buf; alpm_list_t *i, *j; @@ -88,6 +89,8 @@ static int query_fileowner(alpm_list_t *targets) continue; } + bname = basename(filename); + if(!(rpath = resolve_path(filename))) { fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"), filename, strerror(errno)); @@ -103,6 +106,11 @@ static int query_fileowner(alpm_list_t *targets) snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), (const char *)alpm_list_getdata(j)); + /* avoid the costly resolve_path usage if the basenames don't match */ + if(strcmp(basename(path), bname) != 0) { + continue; + } + ppath = resolve_path(path); if(ppath && strcmp(ppath, rpath) == 0) { -- 1.5.3.6

5 10

[pacman-dev] [PATCH] Allow -c,--conf option for ABS
by Scott Horowitz 26 Nov '07

26 Nov '07

In creating my python arch integrity script, which looks for various issues in pkgbuilds and repos, I found it would be useful to be able to have both an abs.conf and an abs64.conf that I can call abs directly with. Right now I have to keep (un)commenting lines each time I want to update the abs tree for each arch, which is a pain. So here's a patch that allows the user to pass -c or --conf. I have no idea if I used git correctly, but it gave me a patch. Scott

3 3

[pacman-dev] [PATCH] Add new -Sq / --needed option.
by Chantry Xavier 26 Nov '07

26 Nov '07

This patch is the result of the constatation than, during one pacman operation, the "local version is up to date. Upgrade anyway?" questions are usually all answered either by yes or by no. Yes when you want to reinstall all the targets. No when you only want to install the missing ones (either because you are installing a group, or because you are copying a pacman -S line from wiki or whatever). So instead of asking this question for every targets, it'll now be configured with a flag. Yes will be the default -S behavior, No will be achieved with the --needed flag. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- contrib/bash_completion | 2 ++ doc/pacman.8.txt | 3 +++ lib/libalpm/alpm.h | 5 +++-- lib/libalpm/sync.c | 17 ++++++++--------- src/pacman/callback.c | 11 ----------- src/pacman/pacman.c | 7 +++++-- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 6aafc9e..c392217 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -170,6 +170,7 @@ _pacman () info) mod="${mod}i" ;; list) mod="${mod}l" ;; print-uris) mod="${mod}p" ;; + needed) mod="${mod}q" ;; search) mod="${mod}s" ;; sysupgrade) mod="${mod}u" ;; upgrades) mod="${mod}u" ;; @@ -268,6 +269,7 @@ _pacman () -i --info \ -l --list \ -p --print-uris \ + -q --needed \ -s --search \ -u --sysupgrade \ -w --downloadonly \ diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 7b10bc0..a8af743 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -243,6 +243,9 @@ Sync Options[[SO]] dependencies yet to be installed. These can be piped to a file and downloaded at a later time, using a program like wget. +*-q, \--needed*:: + Only install the targets that are not already installed and up-to-date. + *-s, \--search* <'regexp'>:: This will search each package in the sync databases for names or descriptions that match `regexp`. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b56f575..7b3b8b0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -280,7 +280,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000 + PM_TRANS_FLAG_PRINTURIS = 0x1000, + PM_TRANS_FLAG_NEEDED = 0x2000 } pmtransflag_t; /* Transaction Events */ @@ -321,7 +322,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, PM_TRANS_CONV_LOCAL_NEWER = 0x10, - PM_TRANS_CONV_LOCAL_UPTODATE = 0x20, + /* 0x20 flag can go here */ PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 } pmtransconv_t; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 16b1998..a3cd180 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -352,15 +352,14 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg)); if(local) { if(alpm_pkg_compare_versions(local, spkg) == 0) { - /* spkg is NOT an upgrade, get confirmation before adding */ - if(!(trans->flags & PM_TRANS_FLAG_PRINTURIS)) { - int resp = 0; - QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp); - if(!resp) { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local)); - return(0); - } + /* spkg is NOT an upgrade */ + if(trans->flags & PM_TRANS_FLAG_NEEDED) { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local)); + return(0); + } else { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local)); } } } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 232ca4c..dd469ec 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -305,7 +305,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, *response = yesno(str); break; case PM_TRANS_CONV_LOCAL_NEWER: - if(!config->op_s_downloadonly) { snprintf(str, LOG_STR_LEN, _(":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "), alpm_pkg_get_name(data1), @@ -315,16 +314,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, *response = 1; } break; - case PM_TRANS_CONV_LOCAL_UPTODATE: - if(!config->op_s_downloadonly) { - snprintf(str, LOG_STR_LEN, _(":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "), - alpm_pkg_get_name(data1), - alpm_pkg_get_version(data1)); - *response = yesno(str); - } else { - *response = 1; - } - break; case PM_TRANS_CONV_CORRUPTED_PKG: if(!config->noconfirm) { snprintf(str, LOG_STR_LEN, _(":: File %s is corrupted. Do you want to delete it? [Y/n] "), diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 31d31da..229fce3 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -129,6 +129,7 @@ static void usage(int op, const char * const myname) printf(_(" -i, --info view package information\n")); printf(_(" -l, --list <repo> view a list of packages in a repo\n")); printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); + printf(_(" -q, --needed only install outdated or not yet installed packages\n")); printf(_(" -s, --search <regex> search remote repositories for matching strings\n")); printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); @@ -287,11 +288,12 @@ static int parseargs(int argc, char *argv[]) {"info", no_argument, 0, 'i'}, {"dbonly", no_argument, 0, 'k'}, {"list", no_argument, 0, 'l'}, - {"nosave", no_argument, 0, 'n'}, {"foreign", no_argument, 0, 'm'}, + {"nosave", no_argument, 0, 'n'}, {"owns", no_argument, 0, 'o'}, {"file", no_argument, 0, 'p'}, {"print-uris", no_argument, 0, 'p'}, + {"needed", no_argument, 0, 'q'}, {"root", required_argument, 0, 'r'}, {"recursive", no_argument, 0, 's'}, {"search", no_argument, 0, 's'}, @@ -314,7 +316,7 @@ static int parseargs(int argc, char *argv[]) {0, 0, 0, 0} }; - while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepituwygz", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ if(opt < 0) { @@ -431,6 +433,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_isfile = 1; config->flags |= PM_TRANS_FLAG_PRINTURIS; break; + case 'q': config->flags |= PM_TRANS_FLAG_NEEDED; break; case 'r': if(alpm_option_set_root(optarg) != 0) { pm_printf(PM_LOG_ERROR, _("problem setting root '%s' (%s)\n"), -- 1.5.3.6

4 5

[pacman-dev] [PATCH] Minor fixes in sync.c and deps.c.
by Chantry Xavier 26 Nov '07

26 Nov '07

* memleak found by Nagy in checkdeps * an useless line found by Nagy in resolvedeps * data wasn't set to the missing dependencies in sync_prepare Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/deps.c | 5 +++-- lib/libalpm/sync.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 4a4f654..e9d3966 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -339,12 +339,14 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, } for(k = alpm_pkg_get_depends(p); k; k = k->next) { + char *missdepstring; pmdepend_t *depend = k->data; - char *missdepstring = alpm_dep_get_string(depend); if(!alpm_depcmp(oldpkg, depend)) { continue; } + missdepstring = alpm_dep_get_string(depend); + /* OK, we don't want to break this depend */ /* 1. for efficiency we check newpkg first if we are in the upgrade list */ @@ -670,7 +672,6 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, if(!sync) { continue; } - found = alpm_depcmp(sync, missdep); found = alpm_depcmp(sync, missdep) && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove); if(!found) { continue; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f6fa318..5e58400 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -670,7 +670,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync if(deps) { pm_errno = PM_ERR_UNSATISFIED_DEPS; ret = -1; - FREELIST(deps); + *data = deps; goto cleanup; } } -- 1.5.3.6

2 1

[pacman-dev] [PATCH] libalpm/sync.c : conflicts resolving cleanup.
by Nagy Gabor 26 Nov '07

26 Nov '07

The original patch from Nagy tried to resolve target vs target conflicts, and so broke the following pactests : sync040, sync041 and sync990 Nagy's proposal to solve this situation was to choose the interactive way, ask the user how to deal with it: either remove pkg1 or remove pkg2 or stop here. So he left this as a TODO. But instead of trying to resolve these conflicts or asking the user, I simply made pacman fail in this case. It's simpler, and still acceptable in my opinion. However, this broke the following pactests : sync893, sync897, sync898, sync992, sync999 But some of them are rather strange.. Reference: http://www.archlinux.org/pipermail/pacman-dev/2007-October/009745.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/sync.c | 222 +++++++++++++++------------------------------------- 1 files changed, 62 insertions(+), 160 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f6fa318..a2bc39c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -385,20 +385,6 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy return(0); } -/* Helper functions for alpm_list_remove - */ -static int syncpkg_cmp(const void *s1, const void *s2) -{ - const pmsyncpkg_t *sp1 = s1; - const pmsyncpkg_t *sp2 = s2; - pmpkg_t *p1, *p2; - - p1 = alpm_sync_get_pkg(sp1); - p2 = alpm_sync_get_pkg(sp2); - - return(strcmp(alpm_pkg_get_name(p1), alpm_pkg_get_name(p2))); -} - int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data) { alpm_list_t *deps = NULL; @@ -490,170 +476,86 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "looking for conflicts\n"); - deps = _alpm_checkconflicts(db_local, list); + + /* 1. check for conflicts in the target list */ + _alpm_log(PM_LOG_DEBUG, "check targets vs targets\n"); + deps = _alpm_innerconflicts(list); + + /* TODO : should we try to resolve targets vs targets conflicts? */ if(deps) { - int errorout = 0; - alpm_list_t *asked = NULL; - pmconflict_t *conflict = NULL; - - for(i = deps; i && !errorout; i = i->next) { - pmsyncpkg_t *sync; - pmpkg_t *found = NULL; - - conflict = i->data; - _alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", - conflict->package1, conflict->package2); - /* check if the conflicting package is about to be removed/replaced. - * if so, then just ignore it. */ - for(j = trans->packages; j && !found; j = j->next) { - sync = j->data; - if(sync->type == PM_SYNC_TYPE_REPLACE) { - found = _alpm_pkg_find(conflict->package2, sync->data); - } - } - if(found) { - _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping\n", - alpm_pkg_get_name(found)); - continue; - } + pm_errno = PM_ERR_CONFLICTING_DEPS; + ret = -1; + *data = deps; + goto cleanup; + } - sync = _alpm_sync_find(trans->packages, conflict->package1); - if(sync == NULL) { - _alpm_log(PM_LOG_DEBUG, "'%s' not found in transaction set -- skipping\n", - conflict->package1); - continue; - } - pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); - /* check if this package provides the package it's conflicting with */ - if(alpm_list_find(alpm_pkg_get_provides(sync->pkg), - conflict->package2, _alpm_prov_cmp)) { - /* treat like a replaces item so requiredby fields are - * inherited properly. */ - _alpm_log(PM_LOG_DEBUG, "package '%s' provides its own conflict\n", - conflict->package1); - if(!local) { - char *rmpkg = NULL; - int target, depend; - /* hmmm, package2 isn't installed, so it must be conflicting - * with another package in our final list. For example: - * - * pacman -S blackbox xfree86 - * - * If no x-servers are installed and blackbox pulls in xorg, then - * xorg and xfree86 will conflict with each other. In this case, - * we should follow the user's preference and rip xorg out of final, - * opting for xfree86 instead. - */ - - /* figure out which one was requested in targets. If they both - * were, then it's still an unresolvable conflict. */ - target = alpm_list_find_str(trans->targets, conflict->package1); - depend = alpm_list_find_str(trans->targets, conflict->package2); - if(depend && !target) { - _alpm_log(PM_LOG_DEBUG, "'%s' is in the target list -- keeping it\n", - conflict->package2); - /* remove conflict->package1 */ - rmpkg = conflict->package1; - } else if(target && !depend) { - _alpm_log(PM_LOG_DEBUG, "'%s' is in the target list -- keeping it\n", - conflict->package1); - /* remove conflict->package2 */ - rmpkg = conflict->package2; - } else { - /* miss->target2 is not needed, miss->target already provides - * it, let's resolve the conflict */ - rmpkg = conflict->package2; - } - if(rmpkg) { - pmsyncpkg_t *rsync = _alpm_sync_find(trans->packages, rmpkg); - void *vpkg; - _alpm_log(PM_LOG_DEBUG, "removing '%s' from target list\n", - rsync->pkg->name); - trans->packages = alpm_list_remove(trans->packages, rsync, - syncpkg_cmp, &vpkg); - _alpm_sync_free(vpkg); - continue; - } + /* 2. we check for target vs db conflicts (and resolve)*/ + _alpm_log(PM_LOG_DEBUG, "check targets vs db and db vs targets\n"); + deps = _alpm_outerconflicts(db_local, list); + + for(i = deps; i; i = i->next) { + pmconflict_t *conflict = i->data; + + /* if conflict->package2 (the local package) is not elected for removal, + we ask the user */ + int found = 0; + for(j = trans->packages; j && !found; j = j->next) { + pmsyncpkg_t *sync = j->data; + if(sync->type == PM_SYNC_TYPE_REPLACE) { + if(_alpm_pkg_find(conflict->package2, sync->data)) { + found = 1; } } - /* It's a conflict -- see if they want to remove it */ - _alpm_log(PM_LOG_DEBUG, "resolving package '%s' conflict\n", - conflict->package1); - if(local) { - int doremove = 0; - if(!alpm_list_find_str(asked, conflict->package2)) { - QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1, + } + if(found) { + continue; + } + + _alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", + conflict->package1, conflict->package2); + + pmsyncpkg_t *sync = _alpm_sync_find(trans->packages, conflict->package1); + pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); + int doremove = 0; + QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1, conflict->package2, NULL, &doremove); - asked = alpm_list_add(asked, strdup(conflict->package2)); - if(doremove) { - pmpkg_t *q = _alpm_pkg_dup(local); - if(sync->type != PM_SYNC_TYPE_REPLACE) { - /* switch this sync type to REPLACE */ - sync->type = PM_SYNC_TYPE_REPLACE; - _alpm_pkg_free(sync->data); - sync->data = NULL; - } - /* append to the replaces list */ - _alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", - conflict->package2); - sync->data = alpm_list_add(sync->data, q); - /* see if the package is in the current target list */ - pmsyncpkg_t *rsync = _alpm_sync_find(trans->packages, - conflict->package2); - if(rsync) { - /* remove it from the target list */ - void *vpkg; - _alpm_log(PM_LOG_DEBUG, "removing '%s' from target list\n", - conflict->package2); - trans->packages = alpm_list_remove(trans->packages, rsync, - syncpkg_cmp, &vpkg); - _alpm_sync_free(vpkg); - } - } else { - /* abort */ - _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); - errorout = 1; - } - } - } else { - _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); - errorout = 1; + if(doremove) { + pmpkg_t *q = _alpm_pkg_dup(local); + if(sync->type != PM_SYNC_TYPE_REPLACE) { + /* switch this sync type to REPLACE */ + sync->type = PM_SYNC_TYPE_REPLACE; + _alpm_pkg_free(sync->data); + sync->data = NULL; } - } - if(errorout) { - /* The last conflict was unresolvable, so we duplicate it and add it to *data */ - pm_errno = PM_ERR_CONFLICTING_DEPS; + /* append to the replaces list */ + _alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); + sync->data = alpm_list_add(sync->data, q); + } else { /* abort */ + _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); if(data) { - pmconflict_t *lastconflict = conflict; - if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { - _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), - sizeof(pmconflict_t)); + pmconflict_t *retconflict; + if((retconflict = malloc(sizeof(pmconflict_t))) == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(pmconflict_t)); FREELIST(*data); pm_errno = PM_ERR_MEMORY; - } else { - *conflict = *lastconflict; - *data = alpm_list_add(*data, conflict); + ret = -1; + goto cleanup; } + *retconflict = *conflict; + *data = alpm_list_add(*data, retconflict); } - FREELIST(asked); - FREELIST(deps); + pm_errno = PM_ERR_CONFLICTING_DEPS; ret = -1; + FREELIST(deps); goto cleanup; } - FREELIST(asked); - FREELIST(deps); } EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL); + FREELIST(deps); } if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { - /* rebuild remove and list */ - alpm_list_free(list); - list = NULL; - for(i = trans->packages; i; i = i->next) { - pmsyncpkg_t *sync = i->data; - list = alpm_list_add(list, sync->pkg); - } + /* rebuild remove list */ alpm_list_free(remove); remove = NULL; for(i = trans->packages; i; i = i->next) { @@ -670,7 +572,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync if(deps) { pm_errno = PM_ERR_UNSATISFIED_DEPS; ret = -1; - FREELIST(deps); + *data = deps; goto cleanup; } } -- 1.5.3.6

3 2

[pacman-dev] [PATCH] Typo fix in deps.c
by Nagy Gabor 26 Nov '07

26 Nov '07

Attached ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

1 0