moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2008-03-23 16:58:53 -05:00
commit 5f1ccdbc27
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libalpm/add.c
View File

@ -229,6 +229,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm
char *backup = _alpm_backup_file(b->data);
/* safety check (fix the upgrade026 pactest) */
if(!alpm_list_find_str(filelist, backup)) {
FREE(backup);
continue;
}
_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",

3
lib/libalpm/backup.c
View File

@ -42,6 +42,9 @@ int _alpm_backup_split(const char *string, char **file, char **hash)
if(ptr == NULL) {
if(file) {
*file = str;
} else {
/* don't need our dup as the fname wasn't requested, so free it */
FREE(str);
}
return(0);
}

2
src/pacman/util.c
View File

@ -388,7 +388,7 @@ alpm_list_t *strsplit(const char *str, const char splitchar)
if(dup == NULL) {
return(NULL);
}
list = alpm_list_add(list, strdup(prev));
list = alpm_list_add(list, dup);
return(list);
}