diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-01-01 17:25:12 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-02 03:03:18 +0100 |
| commit | ac0605b9c27bf206c99bd73302efeff3ce79797e (patch) | |
| tree | 04d72cc96f3eb72fcb10a56bacb2d09f56ae67a1 /lib/libalpm | |
| parent | dffa0654f2eae1c427a74c647d22f0bbd201ccf7 (diff) | |
| download | pacman-ac0605b9c27bf206c99bd73302efeff3ce79797e.tar.gz pacman-ac0605b9c27bf206c99bd73302efeff3ce79797e.tar.xz | |
new upgade042 pactest + bugfix in chk_filedifference.
This adds a pactest for the relocation of a config file between two packages
(case of etc/profile moving from bash to filesystem).
While running this pactest, I found out that chk_filedifference didn't work
correctly with an empty list as second argument. So that's fixed now.
Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010610.html
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/conflict.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 91f43602..5c53b961 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -251,6 +251,10 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) alpm_list_t *ret = NULL; alpm_list_t *pA = filesA, *pB = filesB; + if(pB == NULL) { + return(alpm_list_strdup(pA)); + } + while(pA && pB) { const char *strA = pA->data; const char *strB = pB->data; |