| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | lib/libalpm/remove.c | 2 | ||||
| -rw-r--r-- | test/pacman/tests/symlink002.py | 2 |
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 7c8a99fb..22ae2bb8 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -266,7 +266,7 @@ static void unlink_file(pmpkg_t *info, char *filename, alpm_list_t *skip_remove, FREE(pkghash); } else { char *filehash = alpm_compute_md5sum(file); - int cmp = strcmp(filehash,pkghash); + int cmp = filehash ? strcmp(filehash, pkghash) : 0; FREE(filehash); FREE(pkghash); if(cmp != 0) { diff --git a/test/pacman/tests/symlink002.py b/test/pacman/tests/symlink002.py index 7dcafb0d..6b7423d9 100644 --- a/test/pacman/tests/symlink002.py +++ b/test/pacman/tests/symlink002.py @@ -41,5 +41,3 @@ self.addrule("!FILE_EXIST=etc/nonexistent") self.addrule("FILE_EXIST=etc/exists3") self.addrule("FILE_TYPE=etc/brokenlink3|link") self.addrule("FILE_TYPE=etc/exists3|file") - -self.expectfailure = True |