index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Dan McGee <dan@archlinux.org> | 2008-02-11 09:51:34 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2008-02-11 20:40:43 -0600 |
commit | fbf3beb8d281e85c69f1683df2d9c7b2fb5c1ab7 (patch) | |
tree | f3d7d9d230bc90cae955cc7aff72981f824de34f /lib/libalpm/conflict.c | |
parent | 7586072beb8fde6631fe43a2eee5ca76255055d0 (diff) |
-rw-r--r-- | lib/libalpm/conflict.c | 14 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index c093705a..3442902c 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -251,10 +251,7 @@ 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)); - } - + /* if both filesA and filesB have entries, do this loop */ while(pA && pB) { const char *strA = pA->data; const char *strB = pB->data; @@ -279,6 +276,15 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) } } } + /* ensure we have completely emptied pA */ + while(pA) { + const char *strA = pA->data; + /* skip directories */ + if(strA[strlen(strA)-1] != '/') { + ret = alpm_list_add(ret, strdup(strA)); + } + pA = pA->next; + } return(ret); } |