moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

code cleanup

This commit is contained in:
Aurelien Foret 2006-01-02 13:26:30 +00:00
parent cd2daa5189
commit db0df44598
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libalpm/add.c
View File

@ -150,13 +150,15 @@ int add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
pmpkg_t *pkg = i->data; pmpkg_t *pkg = i->data;
if(strcmp(pkg->name, pkgname) == 0) { if(strcmp(pkg->name, pkgname) == 0) {
if(versioncmp(pkg->version, pkgver) < 0) { if(versioncmp(pkg->version, pkgver) < 0) {
pmpkg_t *newpkg;
_alpm_log(PM_LOG_WARNING, "replacing older version of %s %s by %s in target list", pkg->name, pkg->version, pkgver); _alpm_log(PM_LOG_WARNING, "replacing older version of %s %s by %s in target list", pkg->name, pkg->version, pkgver);
FREEPKG(i->data); newpkg = pkg_load(name);
i->data = pkg_load(name); if(newpkg == NULL) {
if(i->data == NULL) {
/* pm_errno is already set by pkg_load() */ /* pm_errno is already set by pkg_load() */
goto error; goto error;
} }
FREEPKG(i->data);
i->data = newpkg;
} }
return(0); return(0);
} }
@ -245,11 +247,10 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
*data = pm_list_add(*data, miss); *data = pm_list_add(*data, miss);
} }
} }
FREELIST(lp);
if(errorout) { if(errorout) {
FREELIST(lp);
RET_ERR(PM_ERR_CONFLICTING_DEPS, -1); RET_ERR(PM_ERR_CONFLICTING_DEPS, -1);
} }
FREELIST(lp);
} }
/* re-order w.r.t. dependencies */ /* re-order w.r.t. dependencies */
@ -695,11 +696,7 @@ int add_commit(pmtrans_t *trans, pmdb_t *db)
} }
} }
if(pmo_upgrade) { EVENT(trans, (pmo_upgrade) ? PM_TRANS_EVT_UPGRADE_DONE : PM_TRANS_EVT_ADD_DONE, info, oldpkg);
EVENT(trans, PM_TRANS_EVT_UPGRADE_DONE, oldpkg, info);
} else {
EVENT(trans, PM_TRANS_EVT_ADD_DONE, info, NULL);
}
FREEPKG(oldpkg); FREEPKG(oldpkg);
} }

2
lib/libalpm/alpm.h
View File

@ -29,8 +29,6 @@ extern "C" {
* Arch Linux Package Management library * Arch Linux Package Management library
*/ */
/* #define PM_VERSION "0.1.0" */ /* Comes from autoconf's config.h */
#define PM_ROOT "/" #define PM_ROOT "/"
#define PM_DBPATH "var/lib/pacman" #define PM_DBPATH "var/lib/pacman"
#define PM_CACHEDIR "var/cache/pacman/pkg" #define PM_CACHEDIR "var/cache/pacman/pkg"

4
src/pacman/trans.c
View File

@ -87,8 +87,8 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2)
MSG(CL, "done.\n"); MSG(CL, "done.\n");
snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)", snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)",
(char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME),
(char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION), (char *)alpm_pkg_getinfo(data2, PM_PKG_VERSION),
(char *)alpm_pkg_getinfo(data2, PM_PKG_VERSION)); (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION));
alpm_logaction(str); alpm_logaction(str);
break; break;
} }