Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d2fe083f51008b860be9b7eb287dd7da579bd097
commit d2fe083f51008b860be9b7eb287dd7da579bd097 Author: Michel Hermier <[email protected]> Date: Tue Apr 29 21:24:26 2014 +0200 libpacman: Make Package::name available throught getter method. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index 505d6ac..f82cf76 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -120,7 +120,7 @@ int _pacman_db_add_pkgincache(Database *db, Package *pkg) if(newpkg == NULL) { return(-1); } - _pacman_log(PM_LOG_DEBUG, _("adding entry '%s' in '%s' cache"), newpkg->name, db->treename); + _pacman_log(PM_LOG_DEBUG, _("adding entry '%s' in '%s' cache"), newpkg->name(), db->treename); db->pkgcache = _pacman_list_add_sorted(db->pkgcache, newpkg, _pacman_pkg_cmp); _pacman_db_clear_grpcache(db); @@ -143,7 +143,7 @@ int _pacman_db_remove_pkgfromcache(Database *db, Package *pkg) return(-1); } - _pacman_log(PM_LOG_DEBUG, _("removing entry '%s' from '%s' cache"), pkg->name, db->treename); + _pacman_log(PM_LOG_DEBUG, _("removing entry '%s' from '%s' cache"), pkg->name(), db->treename); delete data; _pacman_db_clear_grpcache(db); @@ -205,7 +205,7 @@ int _pacman_db_load_grpcache(Database *db) Group *grp = new Group(); STRNCPY(grp->name, (char *)i->data, GRP_NAME_LEN); - grp->packages = _pacman_list_add_sorted(grp->packages, pkg->name, _pacman_grp_cmp); + grp->packages = _pacman_list_add_sorted(grp->packages, pkg->name(), _pacman_grp_cmp); db->grpcache = _pacman_list_add_sorted(db->grpcache, grp, _pacman_grp_cmp); } else { pmlist_t *j; @@ -214,8 +214,8 @@ int _pacman_db_load_grpcache(Database *db) Group *grp = j->data; if(strcmp(grp->name, i->data) == 0) { - if(!_pacman_list_is_strin(pkg->name, grp->packages)) { - grp->packages = _pacman_list_add_sorted(grp->packages, pkg->name, _pacman_grp_cmp); + if(!_pacman_list_is_strin(pkg->name(), grp->packages)) { + grp->packages = _pacman_list_add_sorted(grp->packages, pkg->name(), _pacman_grp_cmp); } } } diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 66a7cfa..d6d399d 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -80,23 +80,23 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) } for(j = tp->getinfo(PM_PKG_CONFLICTS); j; j = j->next) { - if(!strcmp(tp->name, j->data)) { + if(!strcmp(tp->name(), j->data)) { /* a package cannot conflict with itself -- that's just not nice */ continue; } /* CHECK 1: check targets against database */ - _pacman_log(PM_LOG_DEBUG, _("checkconflicts: targ '%s' vs db"), tp->name); + _pacman_log(PM_LOG_DEBUG, _("checkconflicts: targ '%s' vs db"), tp->name()); for(k = _pacman_db_get_pkgcache(db_local); k; k = k->next) { Package *dp = (Package *)k->data; - if(!strcmp(dp->name, tp->name)) { + if(!strcmp(dp->name(), tp->name())) { /* a package cannot conflict with itself -- that's just not nice */ continue; } - if(!strcmp(j->data, dp->name)) { + if(!strcmp(j->data, dp->name())) { /* conflict */ _pacman_log(PM_LOG_DEBUG, _("targs vs db: found %s as a conflict for %s"), - dp->name, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, dp->name, NULL); + dp->name(), tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, dp->name(), NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -109,8 +109,8 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) if(!strcmp(m->data, j->data)) { /* confict */ _pacman_log(PM_LOG_DEBUG, _("targs vs db: found %s as a conflict for %s"), - dp->name, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, dp->name, NULL); + dp->name(), tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, dp->name(), NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -121,18 +121,18 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) } } /* CHECK 2: check targets against targets */ - _pacman_log(PM_LOG_DEBUG, _("checkconflicts: targ '%s' vs targs"), tp->name); + _pacman_log(PM_LOG_DEBUG, _("checkconflicts: targ '%s' vs targs"), tp->name()); for(k = packages; k; k = k->next) { Package *otp = (Package *)k->data; - if(!strcmp(otp->name, tp->name)) { + if(!strcmp(otp->name(), tp->name())) { /* a package cannot conflict with itself -- that's just not nice */ continue; } - if(!strcmp(otp->name, (char *)j->data)) { + if(!strcmp(otp->name(), (char *)j->data)) { /* otp is listed in tp's conflict list */ _pacman_log(PM_LOG_DEBUG, _("targs vs targs: found %s as a conflict for %s"), - otp->name, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, otp->name, NULL); + otp->name(), tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, otp->name(), NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -144,8 +144,8 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) for(m = otp->getinfo(PM_PKG_PROVIDES); m; m = m->next) { if(!strcmp(m->data, j->data)) { _pacman_log(PM_LOG_DEBUG, _("targs vs targs: found %s as a conflict for %s"), - otp->name, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, otp->name, NULL); + otp->name(), tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, otp->name(), NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -157,13 +157,13 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) } } /* CHECK 3: check database against targets */ - _pacman_log(PM_LOG_DEBUG, _("checkconflicts: db vs targ '%s'"), tp->name); + _pacman_log(PM_LOG_DEBUG, _("checkconflicts: db vs targ '%s'"), tp->name()); for(k = _pacman_db_get_pkgcache(db_local); k; k = k->next) { pmlist_t *conflicts = NULL; int usenewconflicts = 0; info = k->data; - if(!strcmp(info->name, tp->name)) { + if(!strcmp(info->name(), tp->name())) { /* a package cannot conflict with itself -- that's just not nice */ continue; } @@ -172,7 +172,7 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) */ for(j = packages; j; j = j->next) { Package *pkg = j->data; - if(!strcmp(pkg->name, info->name)) { + if(!strcmp(pkg->name(), info->name())) { /* Use the new, to-be-installed package's conflicts */ conflicts = pkg->getinfo(PM_PKG_CONFLICTS); usenewconflicts = 1; @@ -183,10 +183,10 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) conflicts = info->getinfo(PM_PKG_CONFLICTS); } for(j = conflicts; j; j = j->next) { - if(!strcmp((char *)j->data, tp->name)) { + if(!strcmp((char *)j->data, tp->name())) { _pacman_log(PM_LOG_DEBUG, _("db vs targs: found %s as a conflict for %s"), - info->name, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, info->name, NULL); + info->name(), tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, info->name(), NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -200,8 +200,8 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) for(n = tp->getinfo(PM_PKG_PROVIDES); n; n = n->next) { if(!strcmp(m->data, n->data)) { _pacman_log(PM_LOG_DEBUG, _("db vs targs: found %s as a conflict for %s"), - info->name, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, info->name, NULL); + info->name(), tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_CONFLICT, PM_DEP_MOD_ANY, info->name(), NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -281,7 +281,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), howmany, howmany - remain + 1); for(j = i; j; j = j->next) { Package *p2 = (Package*)j->data; - if(strcmp(p1->name, p2->name)) { + if(strcmp(p1->name(), p2->name())) { pmlist_t *ret = chk_fileconflicts(p1->files, p2->files); for(k = ret; k; k = k->next) { pmconflict_t *conflict = _pacman_malloc(sizeof(pmconflict_t)); @@ -289,9 +289,9 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski continue; } conflict->type = PM_CONFLICT_TYPE_TARGET; - STRNCPY(conflict->target, p1->name, PKG_NAME_LEN); + STRNCPY(conflict->target, p1->name(), PKG_NAME_LEN); STRNCPY(conflict->file, k->data, CONFLICT_FILE_LEN); - STRNCPY(conflict->ctarget, p2->name, PKG_NAME_LEN); + STRNCPY(conflict->ctarget, p2->name(), PKG_NAME_LEN); conflicts = _pacman_list_add(conflicts, conflict); } FREELIST(ret); @@ -317,10 +317,10 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski ok = 1; } else { if(dbpkg == NULL) { - dbpkg = _pacman_db_get_pkgfromcache(db_local, p->name); + dbpkg = _pacman_db_get_pkgfromcache(db_local, p->name()); } if(dbpkg && !(dbpkg->infolevel & INFRQ_FILES)) { - _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name); + _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name()); db_local->read(dbpkg, INFRQ_FILES); } if(dbpkg && _pacman_list_is_strin(j->data, dbpkg->files)) { @@ -332,11 +332,11 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski for(k = targets; k && !ok; k = k->next) { Package *p2 = (Package *)k->data; /* As long as they're not the current package */ - if(strcmp(p2->name, p->name)) { + if(strcmp(p2->name(), p->name())) { Package *dbpkg2 = NULL; - dbpkg2 = _pacman_db_get_pkgfromcache(db_local, p2->name); + dbpkg2 = _pacman_db_get_pkgfromcache(db_local, p2->name()); if(dbpkg2 && !(dbpkg2->infolevel & INFRQ_FILES)) { - _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg2->name); + _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg2->name()); db_local->read(dbpkg2, INFRQ_FILES); } /* If it used to exist in there, but doesn't anymore */ @@ -370,7 +370,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski continue; } conflict->type = PM_CONFLICT_TYPE_FILE; - STRNCPY(conflict->target, p->name, PKG_NAME_LEN); + STRNCPY(conflict->target, p->name(), PKG_NAME_LEN); STRNCPY(conflict->file, filestr, CONFLICT_FILE_LEN); conflict->ctarget[0] = 0; conflicts = _pacman_list_add(conflicts, conflict); diff --git a/lib/libpacman/db.cpp b/lib/libpacman/db.cpp index ac36e89..f478e21 100644 --- a/lib/libpacman/db.cpp +++ b/lib/libpacman/db.cpp @@ -161,7 +161,7 @@ int Database::read(Package *info, unsigned int inforeq) int ret; ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); - if(_pacman_strempty(info->name) || _pacman_strempty(info->version)) { + if(_pacman_strempty(info->name()) || _pacman_strempty(info->version)) { _pacman_log(PM_LOG_ERROR, _("invalid package entry provided to _pacman_db_read")); return(-1); } diff --git a/lib/libpacman/db/fakedb.cpp b/lib/libpacman/db/fakedb.cpp index d77dc27..a3829be 100644 --- a/lib/libpacman/db/fakedb.cpp +++ b/lib/libpacman/db/fakedb.cpp @@ -64,7 +64,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) continue; } if(strncmp("name", p, q-p) == 0) { - STRNCPY(dummy->name, q+1, PKG_NAME_LEN); + STRNCPY(dummy->m_name, q+1, PKG_NAME_LEN); } else if(strncmp("version", p, q-p) == 0) { STRNCPY(dummy->version, q+1, PKG_VERSION_LEN); } else if(strncmp("depend", p, q-p) == 0) { @@ -74,7 +74,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) } } FREE(str); - if(dummy->name[0] == 0 || dummy->version[0] == 0) { + if(dummy->m_name[0] == 0 || dummy->version[0] == 0) { delete dummy; RET_ERR(PM_ERR_PKG_INVALID_NAME, NULL); } diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 5ba268f..ae391b4 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -65,7 +65,7 @@ int _pacman_localpkg_file_reader(Database *db, Package *pkg, unsigned int flags, FILE *fp = NULL; char path[PATH_MAX]; - snprintf(path, PATH_MAX, "%s/%s-%s/%s", db->path, pkg->name, pkg->version, file); + snprintf(path, PATH_MAX, "%s/%s-%s/%s", db->path, pkg->name(), pkg->version, file); fp = fopen(path, "r"); if(fp == NULL) { _pacman_log(PM_LOG_WARNING, "%s (%s)", path, strerror(errno)); @@ -84,12 +84,12 @@ int LocalPackage::read(unsigned int flags) char path[PATH_MAX]; ASSERT(database != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if(f_strempty(name) || f_strempty(version)) { + if(f_strempty(name()) || f_strempty(version)) { _pacman_log(PM_LOG_ERROR, _("invalid package entry provided to _pacman_localdb_read")); return(-1); } - snprintf(path, PATH_MAX, "%s/%s-%s", database->path, name, version); + snprintf(path, PATH_MAX, "%s/%s-%s", database->path, name(), version); if(stat(path, &buf)) { /* directory doesn't exist or can't be opened */ return(-1); @@ -104,7 +104,7 @@ int LocalPackage::read(unsigned int flags) /* INSTALL */ if(flags & INFRQ_SCRIPLET) { - snprintf(path, PATH_MAX, "%s/%s-%s/install", database->path, name, version); + snprintf(path, PATH_MAX, "%s/%s-%s/install", database->path, name(), version); if(!stat(path, &buf)) { scriptlet = 1; } @@ -281,7 +281,7 @@ int _pacman_localdb_file_reader(Database *db, Package *info, unsigned int infore FILE *fp = NULL; char path[PATH_MAX]; - snprintf(path, PATH_MAX, "%s/%s-%s/%s", db->path, info->name, info->version, file); + snprintf(path, PATH_MAX, "%s/%s-%s/%s", db->path, info->name(), info->version, file); fp = fopen(path, "r"); if(fp == NULL) { _pacman_log(PM_LOG_WARNING, "%s (%s)", path, strerror(errno)); @@ -301,12 +301,12 @@ int _pacman_localdb_read(Database *db, Package *info, unsigned int inforeq) char path[PATH_MAX]; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if(info == NULL || info->name[0] == 0 || info->version[0] == 0) { + if(info == NULL || info->name()[0] == 0 || info->version[0] == 0) { _pacman_log(PM_LOG_ERROR, _("invalid package entry provided to _pacman_localdb_read")); return(-1); } - snprintf(path, PATH_MAX, "%s/%s-%s", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%s/%s-%s", db->path, info->name(), info->version); if(stat(path, &buf)) { /* directory doesn't exist or can't be opened */ return(-1); @@ -321,7 +321,7 @@ int _pacman_localdb_read(Database *db, Package *info, unsigned int inforeq) /* INSTALL */ if(inforeq & INFRQ_SCRIPLET) { - snprintf(path, PATH_MAX, "%s/%s-%s/install", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%s/%s-%s/install", db->path, info->name(), info->version); if(!stat(path, &buf)) { info->scriptlet = 1; } @@ -371,7 +371,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); - snprintf(path, PATH_MAX, "%s/%s-%s", this->path, info->name, info->version); + snprintf(path, PATH_MAX, "%s/%s-%s", this->path, info->name(), info->version); oldmask = umask(0000); mkdir(path, 0755); /* make sure we have a sane umask */ @@ -379,13 +379,13 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) /* DESC */ if(inforeq & INFRQ_DESC) { - snprintf(path, PATH_MAX, "%s/%s-%s/desc", this->path, info->name, info->version); + snprintf(path, PATH_MAX, "%s/%s-%s/desc", this->path, info->name(), info->version); if((fp = fopen(path, "w")) == NULL) { _pacman_log(PM_LOG_ERROR, _("db_write: could not open file %s/desc"), treename); retval = 1; goto cleanup; } - _pacman_localdb_write_string("NAME", info->name, fp); + _pacman_localdb_write_string("NAME", info->name(), fp); _pacman_localdb_write_string("VERSION", info->version, fp); if(info->desc[0]) { _pacman_localdb_write_stringlist("DESC", info->desc_localized, fp); @@ -413,7 +413,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) /* FILES */ if(inforeq & INFRQ_FILES) { - snprintf(path, PATH_MAX, "%s/%s-%s/files", this->path, info->name, info->version); + snprintf(path, PATH_MAX, "%s/%s-%s/files", this->path, info->name(), info->version); if((fp = fopen(path, "w")) == NULL) { _pacman_log(PM_LOG_ERROR, _("db_write: could not open file %s/files"), treename); retval = -1; @@ -427,7 +427,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) /* DEPENDS */ if(inforeq & INFRQ_DEPENDS) { - snprintf(path, PATH_MAX, "%s/%s-%s/depends", this->path, info->name, info->version); + snprintf(path, PATH_MAX, "%s/%s-%s/depends", this->path, info->name(), info->version); if((fp = fopen(path, "w")) == NULL) { _pacman_log(PM_LOG_ERROR, _("db_write: could not open file %s/depends"), treename); retval = -1; @@ -460,7 +460,7 @@ int LocalDatabase::remove(Package *info) ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); - snprintf(path, PATH_MAX, "%s/%s-%s", this->path, info->name, info->version); + snprintf(path, PATH_MAX, "%s/%s-%s", this->path, info->name(), info->version); if(_pacman_rmrf(path) == -1) { return(-1); } diff --git a/lib/libpacman/db/syncdb.cpp b/lib/libpacman/db/syncdb.cpp index 1e99dcb..c2456b1 100644 --- a/lib/libpacman/db/syncdb.cpp +++ b/lib/libpacman/db/syncdb.cpp @@ -90,7 +90,7 @@ int SyncPackage::read(unsigned int flags) int descdone = 0, depsdone = 0; ASSERT(database != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if(name[0] == 0 || version[0] == 0) { + if(name()[0] == 0 || version[0] == 0) { _pacman_log(PM_LOG_ERROR, _("invalid package entry provided to _pacman_syncdb_read")); return(-1); } @@ -307,7 +307,7 @@ int _pacman_syncdb_read(Database *db, Package *info, unsigned int inforeq) int descdone = 0, depsdone = 0; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if(info == NULL || info->name[0] == 0 || info->version[0] == 0) { + if(info == NULL || info->name()[0] == 0 || info->version[0] == 0) { _pacman_log(PM_LOG_ERROR, _("invalid package entry provided to _pacman_syncdb_read")); return(-1); } diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 7aea416..9a4f8da 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -232,7 +232,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag continue; } - if((oldpkg = _pacman_db_get_pkgfromcache(db_local, tp->name)) == NULL) { + if((oldpkg = _pacman_db_get_pkgfromcache(db_local, tp->name())) == NULL) { continue; } for(j = oldpkg->getinfo(PM_PKG_REQUIREDBY); j; j = j->next) { @@ -243,7 +243,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag /* hmmm... package isn't installed.. */ continue; } - if(_pacman_pkg_isin(p->name, packages)) { + if(_pacman_pkg_isin(p->name(), packages)) { /* this package is also in the upgrade list, so don't worry about it */ continue; } @@ -252,8 +252,8 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag _pacman_splitdep(k->data, &depend); if(_pacman_depcmp(oldpkg, &depend) && !_pacman_depcmp(tp, &depend)) { _pacman_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"), - oldpkg->name, p->name); - miss = _pacman_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend.mod, + oldpkg->name(), p->name()); + miss = _pacman_depmiss_new(p->name(), PM_DEP_TYPE_DEPEND, depend.mod, depend.name, depend.version); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); @@ -280,7 +280,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag /* check database for literal packages */ for(k = _pacman_db_get_pkgcache(db_local); k && !found; k = k->next) { Package *p = (Package *)k->data; - if(!strcmp(p->name, depend.name)) { + if(!strcmp(p->name(), depend.name)) { if(depend.mod == PM_DEP_MOD_ANY) { /* accept any version */ found = 1; @@ -320,7 +320,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag int skip = 0; for(n = packages; n && !skip; n = n->next) { Package *ptp = n->data; - if(!strcmp(ptp->name, p->name)) { + if(!strcmp(ptp->name(), p->name())) { skip = 1; } } @@ -358,7 +358,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag for(k = packages; k && !found; k = k->next) { Package *p = (Package *)k->data; /* see if the package names match OR if p provides depend.name */ - if(!strcmp(p->name, depend.name) || p->provides(depend.name)) { + if(!strcmp(p->name(), depend.name) || p->provides(depend.name)) { if(depend.mod == PM_DEP_MOD_ANY || p->provides(depend.name)) { /* depend accepts any version or p provides depend (provides - by @@ -389,8 +389,8 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag /* else if still not found... */ if(!found) { _pacman_log(PM_LOG_DEBUG, _("checkdeps: found %s as a dependency for %s"), - depend.name, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_DEPEND, depend.mod, depend.name, depend.version); + depend.name, tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_DEPEND, depend.mod, depend.name, depend.version); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -414,7 +414,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag for(k=trans->packages; !found && k; k=k->next) { Package *spkg = k->data; - if(spkg && spkg->provides(tp->name)) { + if(spkg && spkg->provides(tp->name())) { found=1; } } @@ -422,13 +422,13 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag pmsyncpkg_t *ps = k->data; Package *spkg = ps->pkg; - if(spkg && spkg->provides(tp->name)) { + if(spkg && spkg->provides(tp->name())) { found=1; } } if(!found) { - _pacman_log(PM_LOG_DEBUG, _("checkdeps: found %s which requires %s"), (char *)j->data, tp->name); - miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_REQUIRED, PM_DEP_MOD_ANY, j->data, NULL); + _pacman_log(PM_LOG_DEBUG, _("checkdeps: found %s which requires %s"), (char *)j->data, tp->name()); + miss = _pacman_depmiss_new(tp->name(), PM_DEP_TYPE_REQUIRED, PM_DEP_MOD_ANY, j->data, NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); } else { @@ -522,7 +522,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) _pacman_log(PM_LOG_WARNING, _("cannot find package \"%s\" or anything that provides it!"), depend.name); continue; } - dep = _pacman_db_get_pkgfromcache(db, ((Package *)k->data)->name); + dep = _pacman_db_get_pkgfromcache(db, ((Package *)k->data)->name()); if(dep == NULL) { _pacman_log(PM_LOG_ERROR, _("dep is NULL!")); /* wtf */ @@ -530,33 +530,33 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } FREELISTPTR(k); } - if(_pacman_pkg_isin(dep->name, targs)) { + if(_pacman_pkg_isin(dep->name(), targs)) { continue; } /* see if it was explicitly installed */ if(dep->reason == PM_PKG_REASON_EXPLICIT) { - _pacman_log(PM_LOG_FLOW2, _("excluding %s -- explicitly installed"), dep->name); + _pacman_log(PM_LOG_FLOW2, _("excluding %s -- explicitly installed"), dep->name()); needed = 1; } /* see if other packages need it */ for(k = dep->getinfo(PM_PKG_REQUIREDBY); k && !needed; k = k->next) { Package *dummy = _pacman_db_get_pkgfromcache(db, k->data); - if(!_pacman_pkg_isin(dummy->name, targs)) { + if(!_pacman_pkg_isin(dummy->name(), targs)) { needed = 1; } } if(!needed) { - Package *pkg = new Package(dep->name, dep->version); + Package *pkg = new Package(dep->name(), dep->version); if(pkg == NULL) { continue; } /* add it to the target list */ - _pacman_log(PM_LOG_DEBUG, _("loading ALL info for '%s'"), pkg->name); + _pacman_log(PM_LOG_DEBUG, _("loading ALL info for '%s'"), pkg->name()); db->read(pkg, INFRQ_ALL); newtargs = _pacman_list_add(newtargs, pkg); - _pacman_log(PM_LOG_FLOW2, _("adding '%s' to the targets"), pkg->name); + _pacman_log(PM_LOG_FLOW2, _("adding '%s' to the targets"), pkg->name()); newtargs = _pacman_removedeps(db, newtargs); } } @@ -600,7 +600,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, Package *sp = (Package *)j->data; if(sp->provides(miss->depend.name)) { _pacman_log(PM_LOG_DEBUG, _("%s provides dependency %s -- skipping"), - sp->name, miss->depend.name); + sp->name(), miss->depend.name); found = 1; } } @@ -636,19 +636,19 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, pm_errno = PM_ERR_UNSATISFIED_DEPS; goto error; } - if(_pacman_pkg_isin(ps->name, list)) { + if(_pacman_pkg_isin(ps->name(), list)) { /* this dep is already in the target list */ _pacman_log(PM_LOG_DEBUG, _("dependency %s is already in the target list -- skipping"), - ps->name); + ps->name()); continue; } - if(!_pacman_pkg_isin(ps->name, trail)) { + if(!_pacman_pkg_isin(ps->name(), trail)) { /* check pmo_ignorepkg and pmo_s_ignore to make sure we haven't pulled in * something we're not supposed to. */ int usedep = 1; - if(_pacman_list_is_strin(ps->name, handle->ignorepkg)) { + if(_pacman_list_is_strin(ps->name(), handle->ignorepkg)) { Package *dummypkg = new Package(miss->target, NULL); QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, ps, NULL, &usedep); delete dummypkg; @@ -659,7 +659,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, goto error; } _pacman_log(PM_LOG_DEBUG, _("pulling dependency %s (needed by %s)"), - ps->name, syncpkg->name); + ps->name(), syncpkg->name()); list = _pacman_list_add(list, ps); } else { _pacman_log(PM_LOG_ERROR, _("cannot resolve dependencies for \"%s\""), miss->target); @@ -676,7 +676,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, } } else { /* cycle detected -- skip it */ - _pacman_log(PM_LOG_DEBUG, _("dependency cycle detected: %s"), ps->name); + _pacman_log(PM_LOG_DEBUG, _("dependency cycle detected: %s"), ps->name()); } } @@ -694,7 +694,7 @@ int _pacman_depcmp(Package *pkg, pmdepend_t *dep) int equal = 0, cmp; const char *mod = "~="; - if(strcmp(pkg->name, dep->name) == 0 + if(strcmp(pkg->name(), dep->name) == 0 || pkg->provides(dep->name)) { if(dep->mod == PM_DEP_MOD_ANY) { equal = 1; diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 855cf5f..da7addc 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -57,7 +57,7 @@ Package::Package(const char *name, const char *version) : reason(PM_PKG_REASON_EXPLICIT) { if(!_pacman_strempty(name)) { - STRNCPY(this->name, name, PKG_NAME_LEN); + STRNCPY(m_name, name, PKG_NAME_LEN); } if(!_pacman_strempty(version)) { STRNCPY(this->version, version, PKG_VERSION_LEN); @@ -67,7 +67,7 @@ Package::Package(const char *name, const char *version) Package::Package(const libpacman::Package &other) { database = other.database; - STRNCPY(name, other.name, PKG_NAME_LEN); + STRNCPY(m_name, other.m_name, PKG_NAME_LEN); STRNCPY(version, other.version, PKG_VERSION_LEN); STRNCPY(desc, other.desc, PKG_DESC_LEN); STRNCPY(url, other.url, PKG_URL_LEN); @@ -182,7 +182,7 @@ unsigned int _pacman_pkg_parm_to_flag(unsigned char parm) bool Package::set_filename(const char *filename, int witharch) { - return Package::splitname(filename, name, version, witharch); + return Package::splitname(filename, m_name, version, witharch); } int _pacman_pkg_delete(Package *self) @@ -217,14 +217,14 @@ int _pacman_pkg_fini(Package *self) */ int _pacman_pkg_cmp(const void *p1, const void *p2) { - return(strcmp(((Package *)p1)->name, ((Package *)p2)->name)); + return(strcmp(((Package *)p1)->name(), ((Package *)p2)->name())); } int _pacman_pkg_is_valid(const Package *pkg, const pmtrans_t *trans, const char *pkgfile) { struct utsname name; - if(_pacman_strempty(pkg->name)) { + if(_pacman_strempty(pkg->m_name)) { _pacman_log(PM_LOG_ERROR, _("missing package name in %s"), pkgfile); goto pkg_error; } @@ -277,7 +277,7 @@ Package *_pacman_pkg_isin(const char *needle, pmlist_t *haystack) for(lp = haystack; lp; lp = lp->next) { Package *info = lp->data; - if(info && !strcmp(info->name, needle)) { + if(info && !strcmp(info->name(), needle)) { return(lp->data); } } @@ -343,7 +343,7 @@ int Package::write(unsigned int flags) if((ret = database->write(this, flags)) != 0) { _pacman_log(PM_LOG_ERROR, _("could not update requiredby for database entry %s-%s"), - name, version); + name(), version); } return ret; } @@ -380,7 +380,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_REPLACES: case PM_PKG_FORCE: if(!(infolevel & INFRQ_DESC)) { - _pacman_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), name); + _pacman_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), name()); database->read(this, INFRQ_DESC); } break; @@ -390,7 +390,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_CONFLICTS: case PM_PKG_PROVIDES: if(!(infolevel & INFRQ_DEPENDS)) { - _pacman_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", name); + _pacman_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", name()); database->read(this, INFRQ_DEPENDS); } break; @@ -398,14 +398,14 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_FILES: case PM_PKG_BACKUP: if(this->data == handle->db_local && !(infolevel & INFRQ_FILES)) { - _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), name); + _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), name()); database->read(this, INFRQ_FILES); } break; /* Scriptlet */ case PM_PKG_SCRIPLET: if(this->data == handle->db_local && !(infolevel & INFRQ_SCRIPLET)) { - _pacman_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), name); + _pacman_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), name()); database->read(this, INFRQ_SCRIPLET); } break; @@ -416,7 +416,7 @@ void *Package::getinfo(unsigned char parm) #endif switch(parm) { - case PM_PKG_NAME: data = name; break; + case PM_PKG_NAME: data = m_name; break; case PM_PKG_VERSION: data = version; break; case PM_PKG_DESC: data = desc; break; case PM_PKG_GROUPS: data = groups; break; @@ -502,7 +502,7 @@ pmlist_t *_pacman_pkg_getowners(const char *filename) int Package::filename(char *str, size_t size) const { return snprintf(str, size, "%s-%s-%s%s", - name, version, arch, PM_EXT_PKG); + m_name, version, arch, PM_EXT_PKG); } /* Look for a filename in a Package.backup list. If we find it, @@ -539,6 +539,11 @@ char *Package::fileneedbackup(const char *file) const return(NULL); } +const char *Package::name() +{ + return getinfo(PM_PKG_NAME); +} + FStringList *Package::provides() const { return m_provides; @@ -586,7 +591,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { } #endif - if(((flags & PM_PACKAGE_FLAG_NAME) && f_str_match(pkg->name, strmatcher)) || + if(((flags & PM_PACKAGE_FLAG_NAME) && f_str_match(pkg->m_name, strmatcher)) || ((flags & PM_PACKAGE_FLAG_VERSION) && f_str_match(pkg->version, strmatcher)) || ((flags & PM_PACKAGE_FLAG_DESCRIPTION) && f_str_match(pkg->desc, strmatcher)) || ((flags & PM_PACKAGE_FLAG_BUILDDATE) && f_str_match(pkg->builddate, strmatcher)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 3a50c95..ff21bc9 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -110,13 +110,15 @@ public: bool set_filename(const char *filename, int witharch); static bool splitname(const char *target, char *name, char *version, int witharch); + const char *name(); + FStringList *provides() const; bool provides(const char *pkgname); libpacman::Database *database; unsigned int flags; - char name[PKG_NAME_LEN]; + char m_name[PKG_NAME_LEN]; char version[PKG_VERSION_LEN]; char desc[PKG_DESC_LEN]; char url[PKG_URL_LEN]; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 4e654dc..23098ab 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -71,13 +71,13 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) key = strsep(&ptr, "="); if(key == NULL || ptr == NULL) { _pacman_log(PM_LOG_DEBUG, _("%s: syntax error in description file line %d"), - info->name[0] != '\0' ? info->name : "error", linenum); + info->name()[0] != '\0' ? info->name() : "error", linenum); } else { f_strtrim(key); key = f_strtoupper(key); f_strtrim(ptr); if(!strcmp(key, "PKGNAME")) { - STRNCPY(info->name, ptr, sizeof(info->name)); + STRNCPY(info->m_name, ptr, sizeof(info->m_name)); } else if(!strcmp(key, "PKGVER")) { STRNCPY(info->version, ptr, sizeof(info->version)); } else if(!strcmp(key, "PKGDESC")) { @@ -127,7 +127,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) info->triggers = f_stringlist_append(info->triggers, ptr); } else { _pacman_log(PM_LOG_DEBUG, _("%s: syntax error in description file line %d"), - info->name[0] != '\0' ? info->name : "error", linenum); + info->name()[0] != '\0' ? info->name() : "error", linenum); } } line[0] = '\0'; diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index f6e3c53..f14c6f8 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -69,7 +69,7 @@ pmsyncpkg_t *_pacman_syncpkg_new(int type, Package *spkg, void *data) ASSERT((ps = f_zalloc(sizeof(*ps))) != NULL, return NULL); ps->type = type; - ps->pkg_name = spkg->name; + ps->pkg_name = spkg->name(); ps->pkg = spkg; ps->data = data; ps->pkg_local = _pacman_db_get_pkgfromcache(handle->db_local, ps->pkg_name); @@ -95,7 +95,7 @@ int _pacman_syncpkg_delete(pmsyncpkg_t *ps) static int _pacman_syncpkg_cmp(const void *s1, const void *s2) { - return(strcmp(((pmsyncpkg_t *)s1)->pkg->name, ((pmsyncpkg_t *)s2)->pkg->name)); + return(strcmp(((pmsyncpkg_t *)s1)->pkg->name(), ((pmsyncpkg_t *)s2)->pkg->name())); } int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) @@ -160,7 +160,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } - pkg_local = _pacman_db_get_pkgfromcache(db_local, spkg->name); + pkg_local = _pacman_db_get_pkgfromcache(db_local, spkg->name()); if(pkg_local) { cmp = _pacman_versioncmp(pkg_local->version, spkg->version); if(cmp > 0) { @@ -168,7 +168,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) int resp = 0; QUESTION(trans, PM_TRANS_CONV_LOCAL_NEWER, pkg_local, NULL, NULL, &resp); if(!resp) { - _pacman_log(PM_LOG_WARNING, _("%s-%s: local version is newer -- skipping"), pkg_local->name, pkg_local->version); + _pacman_log(PM_LOG_WARNING, _("%s-%s: local version is newer -- skipping"), pkg_local->name(), pkg_local->version); return(0); } } else if(cmp == 0) { @@ -176,19 +176,19 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) int resp = 0; QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, pkg_local, NULL, NULL, &resp); if(!resp) { - _pacman_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"), pkg_local->name, pkg_local->version); + _pacman_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"), pkg_local->name(), pkg_local->version); return(0); } } } /* add the package to the transaction */ - if(!_pacman_trans_find(trans, spkg->name)) { + if(!_pacman_trans_find(trans, spkg->name())) { Package *dummy = NULL; pmsyncpkg_t *ps; if(pkg_local) { - dummy = new Package(pkg_local->name, pkg_local->version); + dummy = new Package(pkg_local->name(), pkg_local->version); if(dummy == NULL) { RET_ERR(PM_ERR_MEMORY, -1); } @@ -206,7 +206,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) static int pkg_cmp(const void *p1, const void *p2) { - return(strcmp(((Package *)p1)->name, ((pmsyncpkg_t *)p2)->pkg->name)); + return(strcmp(((Package *)p1)->name(), ((pmsyncpkg_t *)p2)->pkg->name())); } static int check_olddelay(void) @@ -271,7 +271,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) for(i = list; i; i = i->next) { /* add the dependencies found by resolvedeps to the transaction set */ Package *spkg = i->data; - if(!_pacman_trans_find(trans, spkg->name)) { + if(!_pacman_trans_find(trans, spkg->name())) { pmsyncpkg_t *ps = _pacman_syncpkg_new(PM_SYNC_TYPE_DEPEND, spkg, NULL); if(ps == NULL) { ret = -1; @@ -279,7 +279,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) } trans->syncpkgs = _pacman_list_add(trans->syncpkgs, ps); _pacman_log(PM_LOG_FLOW2, _("adding package %s-%s to the transaction targets"), - spkg->name, spkg->version); + spkg->name(), spkg->version); } else { /* remove the original targets from the list if requested */ if((trans->flags & PM_TRANS_FLAG_DEPENDSONLY)) { @@ -556,7 +556,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) if(!strcmp(m->data, o->data)) { /* found matching provisio -- we're good to go */ _pacman_log(PM_LOG_FLOW2, _("found '%s' as a provision for '%s' -- conflict aborted"), - sp->pkg->name, (char *)o->data); + sp->pkg->name(), (char *)o->data); pfound = 1; } } @@ -644,8 +644,8 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) if(ps->type == PM_SYNC_TYPE_REPLACE) { for(j = ps->data; j; j = j->next) { Package *pkg = j->data; - if(!_pacman_pkg_isin(pkg->name, tr->packages)) { - if(_pacman_trans_addtarget(tr, pkg->name) == -1) { + if(!_pacman_pkg_isin(pkg->name(), tr->packages)) { + if(_pacman_trans_addtarget(tr, pkg->name()) == -1) { goto error; } replaces++; @@ -684,7 +684,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) pmsyncpkg_t *ps = i->data; Package *spkg = ps->pkg; char str[PATH_MAX]; - snprintf(str, PATH_MAX, "%s%s/%s-%s-%s" PM_EXT_PKG, handle->root, handle->cachedir, spkg->name, spkg->version, spkg->arch); + snprintf(str, PATH_MAX, "%s%s/%s-%s-%s" PM_EXT_PKG, handle->root, handle->cachedir, spkg->name(), spkg->version, spkg->arch); if(_pacman_trans_addtarget(tr, str) == -1) { goto error; } @@ -732,14 +732,14 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) continue; } for(m = depender->depends; m; m = m->next) { - if(!strcmp(m->data, old->name)) { + if(!strcmp(m->data, old->name())) { FREE(m->data); - m->data = strdup(pkg_new->name); + m->data = strdup(pkg_new->name()); } } if(db_local->write(depender, INFRQ_DEPENDS) == -1) { _pacman_log(PM_LOG_ERROR, _("could not update requiredby for database entry %s-%s"), - pkg_new->name, pkg_new->version); + pkg_new->name(), pkg_new->version); } /* add the new requiredby */ pkg_new->requiredby = _pacman_stringlist_append(pkg_new->requiredby, k->data); @@ -748,7 +748,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) } if(db_local->write(pkg_new, INFRQ_DEPENDS) == -1) { _pacman_log(PM_LOG_ERROR, _("could not update new database entry %s-%s"), - pkg_new->name, pkg_new->version); + pkg_new->name(), pkg_new->version); } } } @@ -900,7 +900,7 @@ int _pacman_trans_download_commit(pmtrans_t *trans, pmlist_t **data) QUESTION(trans, PM_TRANS_CONV_CORRUPTED_PKG, pkgname, NULL, NULL, &doremove); } if(doremove) { - snprintf(str, PATH_MAX, "%s%s/%s-%s-%s" PM_EXT_PKG, handle->root, handle->cachedir, spkg->name, spkg->version, spkg->arch); + snprintf(str, PATH_MAX, "%s%s/%s-%s-%s" PM_EXT_PKG, handle->root, handle->cachedir, spkg->name(), spkg->version, spkg->arch); unlink(str); snprintf(ptr, 512, _("archive %s was corrupted (bad MD5 or SHA1 checksum)\n"), pkgname); } else { diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index b73aa39..906b439 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -235,7 +235,7 @@ pmsyncpkg_t *_pacman_trans_find(const pmtrans_t *trans, const char *pkgname) for(i = trans->syncpkgs; i != NULL ; i = i->next) { pmsyncpkg_t *ps = i->data; - if(ps && !strcmp(ps->pkg->name, pkgname)) { + if(ps && !strcmp(ps->pkg->name(), pkgname)) { return ps; } } @@ -276,7 +276,7 @@ pmsyncpkg_t *_pacman_trans_add(pmtrans_t *trans, pmsyncpkg_t *syncpkg, int flags if(syncpkg->pkg != NULL && syncpkg->pkg_local == NULL) { Database *db_local = trans->handle->db_local; - syncpkg->pkg_local = _pacman_db_get_pkgfromcache(db_local, syncpkg->pkg->name); + syncpkg->pkg_local = _pacman_db_get_pkgfromcache(db_local, syncpkg->pkg->name()); } if((syncpkg_queued = _pacman_trans_find(trans, syncpkg->pkg_name)) != NULL) { @@ -293,7 +293,7 @@ int _pacman_trans_add_package(pmtrans_t *trans, Package *pkg, pmtranstype_t type ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); - _pacman_log(PM_LOG_FLOW2, _("adding %s in the targets list"), pkg->name); + _pacman_log(PM_LOG_FLOW2, _("adding %s in the targets list"), pkg->name()); trans->packages = _pacman_list_add(trans->packages, pkg); return 0; } @@ -340,7 +340,7 @@ int _pacman_remove_addtarget(pmtrans_t *trans, const char *name) } /* ignore holdpkgs on upgrade */ - if((trans == handle->trans) && _pacman_list_is_strin(pkg_local->name, handle->holdpkg)) { + if((trans == handle->trans) && _pacman_list_is_strin(pkg_local->name(), handle->holdpkg)) { int resp = 0; QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, pkg_local, NULL, NULL, &resp); if(!resp) { @@ -384,7 +384,7 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) goto error; } - pkg_local = _pacman_db_get_pkgfromcache(db_local, pkg_new->name); + pkg_local = _pacman_db_get_pkgfromcache(db_local, pkg_new->name()); if(trans->type != PM_TRANS_TYPE_UPGRADE) { /* only install this package if it is not already installed */ if(pkg_local != NULL) { @@ -414,7 +414,7 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) * if so, replace it in the list */ for(i = trans->packages; i; i = i->next) { Package *pkg = i->data; - if(strcmp(pkg->name, pkg_new->name) == 0) { + if(strcmp(pkg->name(), pkg_new->name()) == 0) { pkg_queued = pkg; break; } @@ -423,11 +423,11 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) if(pkg_queued != NULL) { if(_pacman_versioncmp(pkg_queued->version, pkg_new->version) < 0) { _pacman_log(PM_LOG_WARNING, _("replacing older version %s-%s by %s in target list"), - pkg_queued->name, pkg_queued->version, pkg_new->version); + pkg_queued->name(), pkg_queued->version, pkg_new->version); f_ptrswap(&i->data, (void **)&pkg_new); } else { _pacman_log(PM_LOG_WARNING, _("newer version %s-%s is in the target list -- skipping"), - pkg_queued->name, pkg_queued->version, pkg_new->version); + pkg_queued->name(), pkg_queued->version, pkg_new->version); } delete pkg_new; } else { @@ -572,7 +572,7 @@ int _pacman_remove_prepare(pmtrans_t *trans, pmlist_t **data) pmdepmissing_t *miss = (pmdepmissing_t *)i->data; Package *pkg_local = db_local->scan(miss->depend.name, INFRQ_ALL); if(pkg_local) { - _pacman_log(PM_LOG_FLOW2, _("pulling %s in the targets list"), pkg_local->name); + _pacman_log(PM_LOG_FLOW2, _("pulling %s in the targets list"), pkg_local->name()); trans->packages = _pacman_list_add(trans->packages, pkg_local); } else { _pacman_log(PM_LOG_ERROR, _("could not find %s in database -- skipping"), @@ -689,7 +689,7 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran if (pkg->size != 0) percent = (double)archive_position_uncompressed(archive) / pkg->size; - PROGRESS(trans, cb_state, pkg->name, (int)(percent * 100), howmany, (howmany - remain +1)); + PROGRESS(trans, cb_state, pkg->name(), (int)(percent * 100), howmany, (howmany - remain +1)); if(!strcmp(pathname, ".PKGINFO") || !strcmp(pathname, ".FILELIST")) { archive_read_data_skip (archive); @@ -704,11 +704,11 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran if(!strcmp(pathname, ".CHANGELOG")) { /* the changelog goes inside the db */ snprintf(expath, PATH_MAX, "%s/%s-%s/changelog", db_local->path, - pkg->name, pkg->version); + pkg->name(), pkg->version); } else { /* the install script goes inside the db */ snprintf(expath, PATH_MAX, "%s/%s-%s/install", db_local->path, - pkg->name, pkg->version); + pkg->name(), pkg->version); } } else { /* build the new pathname relative to handle->root */ @@ -1028,7 +1028,7 @@ int _pacman_localpackage_remove(Package *pkg, pmtrans_t *trans, int howmany, int } else { _pacman_log(PM_LOG_FLOW2, _("unlinking %s"), file); /* Need at here because we count only real unlinked files ? */ - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkg->name, (int)(percent * 100), howmany, howmany - remain + 1); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkg->name(), (int)(percent * 100), howmany, howmany - remain + 1); position++; if(unlink(line)) { _pacman_log(PM_LOG_ERROR, _("cannot remove file %s"), file); @@ -1071,7 +1071,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) /* see if this is an upgrade. if so, remove the old package first */ if(type == PM_TRANS_TYPE_UPGRADE) { - pkg_local = _pacman_db_get_pkgfromcache(db_local, pkg_new->name); + pkg_local = _pacman_db_get_pkgfromcache(db_local, pkg_new->name()); if(pkg_local == NULL) { /* no previous package version is installed, so this is actually * just an install. */ @@ -1083,17 +1083,17 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) { EVENT(trans, PM_TRANS_EVT_UPGRADE_START, pkg_new, NULL); cb_state = PM_TRANS_PROGRESS_UPGRADE_START; - _pacman_log(PM_LOG_FLOW1, _("upgrading package %s-%s"), pkg_new->name, pkg_new->version); + _pacman_log(PM_LOG_FLOW1, _("upgrading package %s-%s"), pkg_new->name(), pkg_new->version); /* we'll need to save some record for backup checks later */ - oldpkg = new Package(pkg_local->name, pkg_local->version); + oldpkg = new Package(pkg_local->name(), pkg_local->version); if(oldpkg) { if(!(pkg_local->infolevel & INFRQ_FILES)) { - _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg_local->name); + _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg_local->name()); db_local->read(pkg_local, INFRQ_FILES); } oldpkg->backup = _pacman_list_strdup(pkg_local->backup); - strncpy(oldpkg->name, pkg_local->name, PKG_NAME_LEN); + strncpy(oldpkg->m_name, pkg_local->name(), PKG_NAME_LEN); strncpy(oldpkg->version, pkg_local->version, PKG_VERSION_LEN); } @@ -1105,7 +1105,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) if(oldpkg) { pmtrans_t *tr; - _pacman_log(PM_LOG_FLOW1, _("removing old package first (%s-%s)"), oldpkg->name, oldpkg->version); + _pacman_log(PM_LOG_FLOW1, _("removing old package first (%s-%s)"), oldpkg->name(), oldpkg->version); tr = _pacman_trans_new(); if(tr == NULL) { RET_ERR(PM_ERR_TRANS_ABORT, -1); @@ -1115,7 +1115,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) FREETRANS(tr); RET_ERR(PM_ERR_TRANS_ABORT, -1); } - if(_pacman_remove_addtarget(tr, pkg_new->name) == -1) { + if(_pacman_remove_addtarget(tr, pkg_new->name()) == -1) { FREETRANS(tr); RET_ERR(PM_ERR_TRANS_ABORT, -1); } @@ -1127,11 +1127,11 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) } FREETRANS(tr); } - _pacman_log(PM_LOG_FLOW1, _("adding new package %s-%s"), pkg_new->name, pkg_new->version); + _pacman_log(PM_LOG_FLOW1, _("adding new package %s-%s"), pkg_new->name(), pkg_new->version); } else { EVENT(trans, PM_TRANS_EVT_ADD_START, pkg_new, NULL); cb_state = PM_TRANS_PROGRESS_ADD_START; - _pacman_log(PM_LOG_FLOW1, _("adding package %s-%s"), pkg_new->name, pkg_new->version); + _pacman_log(PM_LOG_FLOW1, _("adding package %s-%s"), pkg_new->name(), pkg_new->version); /* pre_install scriptlet */ if(pkg_new->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { @@ -1145,9 +1145,9 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) if(errors) { ret = 1; _pacman_log(PM_LOG_WARNING, _("errors occurred while %s %s"), - (pmo_upgrade ? _("upgrading") : _("installing")), pkg_new->name); + (pmo_upgrade ? _("upgrading") : _("installing")), pkg_new->name()); } else { - PROGRESS(trans, cb_state, pkg_new->name, 100, howmany, howmany - remain + 1); + PROGRESS(trans, cb_state, pkg_new->name(), 100, howmany, howmany - remain + 1); } } @@ -1167,9 +1167,9 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) if(_pacman_splitdep(tmppm->data, &depend)) { continue; } - if(tmppm->data && (!strcmp(depend.name, pkg_new->name) || pkg_new->provides(depend.name))) { - _pacman_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), tmpp->name, pkg_new->name); - pkg_new->requiredby = _pacman_stringlist_append(pkg_new->requiredby, tmpp->name); + if(tmppm->data && (!strcmp(depend.name, pkg_new->name()) || pkg_new->provides(depend.name))) { + _pacman_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), tmpp->name(), pkg_new->name()); + pkg_new->requiredby = _pacman_stringlist_append(pkg_new->requiredby, tmpp->name()); } } } @@ -1180,14 +1180,14 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) pkg_new->installdate[strlen(pkg_new->installdate)-1] = 0; _pacman_log(PM_LOG_FLOW1, _("updating database")); - _pacman_log(PM_LOG_FLOW2, _("adding database entry '%s'"), pkg_new->name); + _pacman_log(PM_LOG_FLOW2, _("adding database entry '%s'"), pkg_new->name()); if(db_local->write(pkg_new, INFRQ_ALL)) { _pacman_log(PM_LOG_ERROR, _("error updating database for %s-%s!"), - pkg_new->name, pkg_new->version); + pkg_new->name(), pkg_new->version); RET_ERR(PM_ERR_DB_WRITE, -1); } if(_pacman_db_add_pkgincache(db_local, pkg_new) == -1) { - _pacman_log(PM_LOG_ERROR, _("could not add entry '%s' in cache"), pkg_new->name); + _pacman_log(PM_LOG_ERROR, _("could not add entry '%s' in cache"), pkg_new->name()); } /* update dependency packages' REQUIREDBY fields */ @@ -1209,7 +1209,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) * the first one. */ /* use the first one */ - depinfo = _pacman_db_get_pkgfromcache(db_local, ((Package *)provides->data)->name); + depinfo = _pacman_db_get_pkgfromcache(db_local, ((Package *)provides->data)->name()); FREELISTPTR(provides); } if(depinfo == NULL) { @@ -1218,11 +1218,11 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) continue; } } - _pacman_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), pkg_new->name, depinfo->name); - depinfo->requiredby = _pacman_stringlist_append(depinfo->getinfo(PM_PKG_REQUIREDBY), pkg_new->name); + _pacman_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), pkg_new->name(), depinfo->name()); + depinfo->requiredby = _pacman_stringlist_append(depinfo->getinfo(PM_PKG_REQUIREDBY), pkg_new->name()); if(db_local->write(depinfo, INFRQ_DEPENDS)) { _pacman_log(PM_LOG_ERROR, _("could not update 'requiredby' database entry %s-%s"), - depinfo->name, depinfo->version); + depinfo->name(), depinfo->version); } } @@ -1232,7 +1232,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) if(pkg_new->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { /* must run ldconfig here because some scriptlets fail due to missing libs otherwise */ _pacman_ldconfig(handle->root); - snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", handle->root, handle->dbpath, db_local->treename, pkg_new->name, pkg_new->version); + snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", handle->root, handle->dbpath, db_local->treename, pkg_new->name(), pkg_new->version); if(pmo_upgrade) { _pacman_runscriptlet(handle->root, pm_install, "post_upgrade", pkg_new->version, oldpkg ? oldpkg->version : NULL, trans); } else { @@ -1285,11 +1285,11 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) if(trans->type != PM_TRANS_TYPE_UPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_START, pkg_local, NULL); - _pacman_log(PM_LOG_FLOW1, _("removing package %s-%s"), pkg_local->name, pkg_local->version); + _pacman_log(PM_LOG_FLOW1, _("removing package %s-%s"), pkg_local->name(), pkg_local->version); /* run the pre-remove scriptlet if it exists */ if(pkg_local->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db_local->path, pkg_local->name, pkg_local->version); + snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db_local->path, pkg_local->name(), pkg_local->version); _pacman_runscriptlet(handle->root, pm_install, "pre_remove", pkg_local->version, NULL, trans); } } @@ -1298,25 +1298,25 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) _pacman_localpackage_remove(pkg_local, trans, howmany, remain); } - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkg_local->name, 100, howmany, howmany - remain + 1); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkg_local->name(), 100, howmany, howmany - remain + 1); if(trans->type != PM_TRANS_TYPE_UPGRADE) { /* run the post-remove script if it exists */ if(pkg_local->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { /* must run ldconfig here because some scriptlets fail due to missing libs otherwise */ _pacman_ldconfig(handle->root); - snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db_local->path, pkg_local->name, pkg_local->version); + snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db_local->path, pkg_local->name(), pkg_local->version); _pacman_runscriptlet(handle->root, pm_install, "post_remove", pkg_local->version, NULL, trans); } } /* remove the package from the database */ _pacman_log(PM_LOG_FLOW1, _("updating database")); - _pacman_log(PM_LOG_FLOW2, _("removing database entry '%s'"), pkg_local->name); + _pacman_log(PM_LOG_FLOW2, _("removing database entry '%s'"), pkg_local->name()); if(db_local->remove(pkg_local) == -1) { - _pacman_log(PM_LOG_ERROR, _("could not remove database entry %s-%s"), pkg_local->name, pkg_local->version); + _pacman_log(PM_LOG_ERROR, _("could not remove database entry %s-%s"), pkg_local->name(), pkg_local->version); } if(_pacman_db_remove_pkgfromcache(db_local, pkg_local) == -1) { - _pacman_log(PM_LOG_ERROR, _("could not remove entry '%s' from cache"), pkg_local->name); + _pacman_log(PM_LOG_ERROR, _("could not remove entry '%s' from cache"), pkg_local->name()); } /* update dependency packages' REQUIREDBY fields */ @@ -1344,7 +1344,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) * the first one. */ /* use the first one */ - depinfo = _pacman_db_get_pkgfromcache(db_local, ((Package *)provides->data)->name); + depinfo = _pacman_db_get_pkgfromcache(db_local, ((Package *)provides->data)->name()); FREELISTPTR(provides); } if(depinfo == NULL) { @@ -1354,12 +1354,12 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) } } /* splice out this entry from requiredby */ - depinfo->requiredby = _pacman_list_remove(depinfo->getinfo(PM_PKG_REQUIREDBY), pkg_local->name, str_cmp, (void **)&data); + depinfo->requiredby = _pacman_list_remove(depinfo->getinfo(PM_PKG_REQUIREDBY), pkg_local->name(), str_cmp, (void **)&data); FREE(data); - _pacman_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), depinfo->name); + _pacman_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), depinfo->name()); if(db_local->write(depinfo, INFRQ_DEPENDS)) { _pacman_log(PM_LOG_ERROR, _("could not update 'requiredby' database entry %s-%s"), - depinfo->name, depinfo->version); + depinfo->name(), depinfo->version); } } diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index 18a5966..0d2a578 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -92,11 +92,11 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) pmlist_t *m; for(m = _pacman_db_get_pkgcache(db_local); m; m = m->next) { Package *lpkg = m->data; - if(!strcmp(k->data, lpkg->name)) { - _pacman_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), k->data, spkg->name); - if(_pacman_list_is_strin(lpkg->name, handle->ignorepkg)) { + if(!strcmp(k->data, lpkg->name())) { + _pacman_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), k->data, spkg->name()); + if(_pacman_list_is_strin(lpkg->name(), handle->ignorepkg)) { _pacman_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), - lpkg->name, lpkg->version, spkg->name, spkg->version); + lpkg->name(), lpkg->version, spkg->name(), spkg->version); } else { /* get confirmation for the replacement */ int doreplace = 0; @@ -107,14 +107,14 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) * the package to replace. */ pmsyncpkg_t *ps; - Package *dummy = new Package(lpkg->name, NULL); + Package *dummy = new Package(lpkg->name(), NULL); if(dummy == NULL) { pm_errno = PM_ERR_MEMORY; goto error; } dummy->requiredby = _pacman_list_strdup(lpkg->requiredby); /* check if spkg->name is already in the packages list. */ - ps = _pacman_trans_find(trans, spkg->name); + ps = _pacman_trans_find(trans, spkg->name()); if(ps) { /* found it -- just append to the replaces list */ ps->data = _pacman_list_add(ps->data, dummy); @@ -130,7 +130,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) trans->syncpkgs = _pacman_list_add(trans->syncpkgs, ps); } _pacman_log(PM_LOG_FLOW2, _("%s-%s elected for upgrade (to be replaced by %s-%s)"), - lpkg->name, lpkg->version, spkg->name, spkg->version); + lpkg->name(), lpkg->version, spkg->name(), spkg->version); } } break; @@ -150,10 +150,10 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) pmsyncpkg_t *ps; for(j = dbs_sync; !spkg && j; j = j->next) { - spkg = _pacman_db_get_pkgfromcache(j->data, local->name); + spkg = _pacman_db_get_pkgfromcache(j->data, local->name()); } if(spkg == NULL) { - _pacman_log(PM_LOG_DEBUG, _("'%s' not found in sync db -- skipping"), local->name); + _pacman_log(PM_LOG_DEBUG, _("'%s' not found in sync db -- skipping"), local->name()); continue; } @@ -161,14 +161,14 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) for(j = trans->syncpkgs; j && !replace; j=j->next) { ps = j->data; if(ps->type == PM_SYNC_TYPE_REPLACE) { - if(_pacman_pkg_isin(spkg->name, ps->data)) { + if(_pacman_pkg_isin(spkg->name(), ps->data)) { replace=1; } } } if(replace) { _pacman_log(PM_LOG_DEBUG, _("'%s' is already elected for removal -- skipping"), - local->name); + local->name()); continue; } @@ -177,26 +177,26 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) if(cmp > 0 && !spkg->getinfo(PM_PKG_FORCE) && !(trans->flags & PM_TRANS_FLAG_DOWNGRADE)) { /* local version is newer */ _pacman_log(PM_LOG_WARNING, _("%s-%s: local version is newer"), - local->name, local->version); + local->name(), local->version); } else if(cmp == 0) { /* versions are identical */ - } else if(_pacman_list_is_strin(local->name, handle->ignorepkg)) { + } else if(_pacman_list_is_strin(local->name(), handle->ignorepkg)) { /* package should be ignored (IgnorePkg) */ _pacman_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - local->name, local->version, spkg->version); + local->name(), local->version, spkg->version); } else if(istoonew(spkg)) { /* package too new (UpgradeDelay) */ _pacman_log(PM_LOG_FLOW1, _("%s-%s: delaying upgrade of package (%s)\n"), - local->name, local->version, spkg->version); + local->name(), local->version, spkg->version); } else if(spkg->getinfo(PM_PKG_STICK)) { _pacman_log(PM_LOG_WARNING, _("%s-%s: please upgrade manually (%s => %s)"), - local->name, local->version, local->version, spkg->version); + local->name(), local->version, local->version, spkg->version); } else { _pacman_log(PM_LOG_FLOW2, _("%s-%s elected for upgrade (%s => %s)"), - local->name, local->version, local->version, spkg->version); + local->name(), local->version, local->version, spkg->version); /* check if spkg->name is already in the packages list. */ - if(!_pacman_trans_find(trans, spkg->name)) { - Package *dummy = new Package(local->name, local->version); + if(!_pacman_trans_find(trans, spkg->name())) { + Package *dummy = new Package(local->name(), local->version); if(dummy == NULL) { goto error; } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
