diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2010-05-17 02:33:28 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-05-18 11:33:00 -0500 |
| commit | eada558e12da1fd605d8c7401ec3c17a37fed9a9 (patch) | |
| tree | e6f20cb33c4a1a110c8fe4ba65a6dcbd2de89084 /lib/libalpm/deps.h | |
| parent | c6f0fc27eda31943e10e2a89e221796efb87dce9 (diff) | |
| download | pacman-eada558e12da1fd605d8c7401ec3c17a37fed9a9.tar.xz | |
Partial fix for the phonon/qt issue
This patch fixes the phonon/qt issue, if all to-be-upgraded packages are
explicit targets (ie. only not-yet-installed packages are pulled by
resolvedeps). This condition covers the most common situations, for example
it should hold with every -Su operation.
After this patch sync405.py passes, but sync406.py doesn't.
The work is inspired by the patch of Henning Garus, thanks for his work:
http://mailman.archlinux.org/pipermail/pacman-dev/2010-February/010429.html
(I moved the alpm_list_diff computation to sync.c in order to compute it
only once.)
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/deps.h')
| -rw-r--r-- | lib/libalpm/deps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 6681c590..ffc3aeeb 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -49,7 +49,7 @@ void _alpm_depmiss_free(pmdepmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt); -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, +int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); |