Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=c8e3ff4308e2793126f587383f3930dc2efe2017
commit c8e3ff4308e2793126f587383f3930dc2efe2017 Author: Michel Hermier <[email protected]> Date: Tue Apr 29 21:58:29 2014 +0200 libpacman: Make Package::version available throught getter method. diff --git a/lib/libpacman/db.cpp b/lib/libpacman/db.cpp index f478e21..a420369 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 a3829be..512b954 100644 --- a/lib/libpacman/db/fakedb.cpp +++ b/lib/libpacman/db/fakedb.cpp @@ -66,7 +66,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) if(strncmp("name", p, q-p) == 0) { 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); + STRNCPY(dummy->m_version, q+1, PKG_VERSION_LEN); } else if(strncmp("depend", p, q-p) == 0) { dummy->depends = _pacman_stringlist_append(dummy->depends, q+1); } else { @@ -74,7 +74,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) } } FREE(str); - if(dummy->m_name[0] == 0 || dummy->version[0] == 0) { + if(dummy->m_name[0] == 0 || dummy->m_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 ae391b4..35dc068 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,14 +379,14 @@ 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("VERSION", info->version, 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 c2456b1..ac4b90a 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 9a4f8da..ebb6674 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -285,7 +285,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag /* accept any version */ found = 1; } else { - char *ver = strdup(p->version); + char *ver = strdup(p->version()); /* check for a release in depend.version. if it's * missing remove it from p->version as well. */ @@ -332,7 +332,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag /* accept any version */ found = 1; } else { - char *ver = strdup(p->version); + char *ver = strdup(p->version()); /* check for a release in depend.version. if it's * missing remove it from p->version as well. */ @@ -365,7 +365,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag * definition - is for all versions) */ found = 1; } else { - char *ver = strdup(p->version); + char *ver = strdup(p->version()); /* check for a release in depend.version. if it's * missing remove it from p->version as well. */ @@ -548,7 +548,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } } if(!needed) { - Package *pkg = new Package(dep->name(), dep->version); + Package *pkg = new Package(dep->name(), dep->version()); if(pkg == NULL) { continue; } diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index da7addc..303b50b 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -60,7 +60,7 @@ Package::Package(const char *name, const char *version) STRNCPY(m_name, name, PKG_NAME_LEN); } if(!_pacman_strempty(version)) { - STRNCPY(this->version, version, PKG_VERSION_LEN); + STRNCPY(m_version, version, PKG_VERSION_LEN); } } @@ -68,7 +68,7 @@ Package::Package(const libpacman::Package &other) { database = other.database; STRNCPY(m_name, other.m_name, PKG_NAME_LEN); - STRNCPY(version, other.version, PKG_VERSION_LEN); + STRNCPY(m_version, other.m_version, PKG_VERSION_LEN); STRNCPY(desc, other.desc, PKG_DESC_LEN); STRNCPY(url, other.url, PKG_URL_LEN); STRNCPY(builddate, other.builddate, PKG_DATE_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, m_name, version, witharch); + return Package::splitname(filename, m_name, m_version, witharch); } int _pacman_pkg_delete(Package *self) @@ -228,11 +228,11 @@ int _pacman_pkg_is_valid(const Package *pkg, const pmtrans_t *trans, const char _pacman_log(PM_LOG_ERROR, _("missing package name in %s"), pkgfile); goto pkg_error; } - if(_pacman_strempty(pkg->version)) { + if(_pacman_strempty(pkg->m_version)) { _pacman_log(PM_LOG_ERROR, _("missing package version in %s"), pkgfile); goto pkg_error; } - if(strchr(pkg->version, '-') != strrchr(pkg->version, '-')) { + if(strchr(pkg->m_version, '-') != strrchr(pkg->m_version, '-')) { _pacman_log(PM_LOG_ERROR, _("version contains additional hyphens in %s"), pkgfile); goto invalid_name_error; } @@ -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; } @@ -417,7 +417,7 @@ void *Package::getinfo(unsigned char parm) switch(parm) { case PM_PKG_NAME: data = m_name; break; - case PM_PKG_VERSION: data = version; break; + case PM_PKG_VERSION: data = m_version; break; case PM_PKG_DESC: data = desc; break; case PM_PKG_GROUPS: data = groups; break; case PM_PKG_URL: data = url; 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", - m_name, version, arch, PM_EXT_PKG); + m_name, m_version, arch, PM_EXT_PKG); } /* Look for a filename in a Package.backup list. If we find it, @@ -544,6 +544,11 @@ const char *Package::name() return getinfo(PM_PKG_NAME); } +const char *Package::version() +{ + return getinfo(PM_PKG_VERSION); +} + FStringList *Package::provides() const { return m_provides; @@ -592,7 +597,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { #endif 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_VERSION) && f_str_match(pkg->m_version, strmatcher)) || ((flags & PM_PACKAGE_FLAG_DESCRIPTION) && f_str_match(pkg->desc, strmatcher)) || ((flags & PM_PACKAGE_FLAG_BUILDDATE) && f_str_match(pkg->builddate, strmatcher)) || ((flags & PM_PACKAGE_FLAG_BUILDTYPE) && f_str_match(pkg->buildtype, strmatcher)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index ff21bc9..def45cf 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -111,6 +111,7 @@ public: static bool splitname(const char *target, char *name, char *version, int witharch); const char *name(); + const char *version(); FStringList *provides() const; bool provides(const char *pkgname); @@ -119,7 +120,7 @@ public: unsigned int flags; char m_name[PKG_NAME_LEN]; - char version[PKG_VERSION_LEN]; + char m_version[PKG_VERSION_LEN]; char desc[PKG_DESC_LEN]; char url[PKG_URL_LEN]; char builddate[PKG_DATE_LEN]; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 23098ab..99ec011 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -79,7 +79,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) if(!strcmp(key, "PKGNAME")) { STRNCPY(info->m_name, ptr, sizeof(info->m_name)); } else if(!strcmp(key, "PKGVER")) { - STRNCPY(info->version, ptr, sizeof(info->version)); + STRNCPY(info->m_version, ptr, sizeof(info->m_version)); } else if(!strcmp(key, "PKGDESC")) { info->desc_localized = f_stringlist_append(info->desc_localized, ptr); if(_pacman_list_count(info->desc_localized) == 1) { diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index f14c6f8..2a8e9b8 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -162,13 +162,13 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) pkg_local = _pacman_db_get_pkgfromcache(db_local, spkg->name()); if(pkg_local) { - cmp = _pacman_versioncmp(pkg_local->version, spkg->version); + cmp = _pacman_versioncmp(pkg_local->version(), spkg->version()); if(cmp > 0) { /* pkg_local version is newer -- get confirmation before adding */ 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,7 +176,7 @@ 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); } } @@ -188,7 +188,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) 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); } @@ -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)) { @@ -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; } @@ -739,7 +739,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) } 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 906b439..0679966 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -394,7 +394,7 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) } else { if(trans->flags & PM_TRANS_FLAG_FRESHEN) { /* only upgrade/install this package if it is already installed and at a lesser version */ - if(pkg_local == NULL || _pacman_versioncmp(pkg_local->version, pkg_new->version) >= 0) { + if(pkg_local == NULL || _pacman_versioncmp(pkg_local->version(), pkg_new->version()) >= 0) { pm_errno = PM_ERR_PKG_CANT_FRESH; goto error; } @@ -421,13 +421,13 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) } if(pkg_queued != NULL) { - if(_pacman_versioncmp(pkg_queued->version, pkg_new->version) < 0) { + 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 { @@ -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 */ @@ -1083,10 +1083,10 @@ 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()); @@ -1094,18 +1094,18 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) } oldpkg->backup = _pacman_list_strdup(pkg_local->backup); strncpy(oldpkg->m_name, pkg_local->name(), PKG_NAME_LEN); - strncpy(oldpkg->version, pkg_local->version, PKG_VERSION_LEN); + strncpy(oldpkg->m_version, pkg_local->version(), PKG_VERSION_LEN); } /* pre_upgrade scriptlet */ if(pkg_new->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _pacman_runscriptlet(handle->root, pkg_new->data, "pre_upgrade", pkg_new->version, oldpkg ? oldpkg->version : NULL, + _pacman_runscriptlet(handle->root, pkg_new->data, "pre_upgrade", pkg_new->version(), oldpkg ? oldpkg->version() : NULL, trans); } 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); @@ -1127,15 +1127,15 @@ 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)) { - _pacman_runscriptlet(handle->root, pkg_new->data, "pre_install", pkg_new->version, NULL, trans); + _pacman_runscriptlet(handle->root, pkg_new->data, "pre_install", pkg_new->version(), NULL, trans); } } @@ -1183,7 +1183,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) _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) { @@ -1222,7 +1222,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) 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,11 +1232,11 @@ 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); + _pacman_runscriptlet(handle->root, pm_install, "post_upgrade", pkg_new->version(), oldpkg ? oldpkg->version() : NULL, trans); } else { - _pacman_runscriptlet(handle->root, pm_install, "post_install", pkg_new->version, NULL, trans); + _pacman_runscriptlet(handle->root, pm_install, "post_install", pkg_new->version(), NULL, trans); } } @@ -1285,12 +1285,12 @@ 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); - _pacman_runscriptlet(handle->root, pm_install, "pre_remove", pkg_local->version, NULL, trans); + 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); } } @@ -1304,8 +1304,8 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) 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); - _pacman_runscriptlet(handle->root, pm_install, "post_remove", pkg_local->version, NULL, trans); + 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); } } @@ -1313,7 +1313,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) _pacman_log(PM_LOG_FLOW1, _("updating database")); _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()); @@ -1359,7 +1359,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) _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 0d2a578..47a5760 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -96,7 +96,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) _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; @@ -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; @@ -173,30 +173,30 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) } /* compare versions and see if we need to upgrade */ - cmp = _pacman_versioncmp(local->version, spkg->version); + cmp = _pacman_versioncmp(local->version(), spkg->version()); 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)) { /* 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); + 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
