bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*untested* potential fix for the NoUpgrade issues.

Browse source
This commit is contained in:
Aaron Griffin 2006-12-21 18:04:49 +00:00
parent 2689fba656
commit 77b4d0d013
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libalpm/add.c
View file

@ -513,6 +513,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
/* file already exists */ /* file already exists */
if(_alpm_list_is_strin(pathname, handle->noupgrade)) { if(_alpm_list_is_strin(pathname, handle->noupgrade)) {
notouch = 1; notouch = 1;
nb = 1;
} else { } else {
if(!pmo_upgrade || oldpkg == NULL) { if(!pmo_upgrade || oldpkg == NULL) {
nb = _alpm_list_is_strin(pathname, info->backup); nb = _alpm_list_is_strin(pathname, info->backup);
@ -706,9 +707,8 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
if(!file) continue; if(!file) continue;
if(!strcmp(file, pathname)) { if(!strcmp(file, pathname)) {
_alpm_log(PM_LOG_DEBUG, _("appending backup entry")); _alpm_log(PM_LOG_DEBUG, _("appending backup entry"));
snprintf(path, PATH_MAX, "%s%s", handle->root, file);
if (info->sha1sum != NULL && info->sha1sum != '\0') { if (info->sha1sum != NULL && info->sha1sum != '\0') {
md5 = _alpm_MDFile(path); md5 = _alpm_MDFile(expath);
/* 32 for the hash, 1 for the terminating NULL, and 1 for the tab delimiter */ /* 32 for the hash, 1 for the terminating NULL, and 1 for the tab delimiter */
if((fn = (char *)malloc(strlen(file)+34)) == NULL) { if((fn = (char *)malloc(strlen(file)+34)) == NULL) {
RET_ERR(PM_ERR_MEMORY, -1); RET_ERR(PM_ERR_MEMORY, -1);
@ -717,7 +717,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
FREE(md5); FREE(md5);
} else { } else {
/* 41 for the hash, 1 for the terminating NULL, and 1 for the tab delimiter */ /* 41 for the hash, 1 for the terminating NULL, and 1 for the tab delimiter */
sha1 = _alpm_SHAFile(path); sha1 = _alpm_SHAFile(expath);
if((fn = (char *)malloc(strlen(file)+43)) == NULL) { if((fn = (char *)malloc(strlen(file)+43)) == NULL) {
RET_ERR(PM_ERR_MEMORY, -1); RET_ERR(PM_ERR_MEMORY, -1);
} }