Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8a43b19b9f1af9737b24787a832e9c700e3ad129
commit 8a43b19b9f1af9737b24787a832e9c700e3ad129 Author: Michel Hermier <[email protected]> Date: Mon May 5 14:00:13 2014 +0200 libpacman: Make Package::backup a getter. diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index a03ad47..7ef6c3b 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -420,7 +420,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) goto cleanup; } _pacman_localdb_write_stringlist("FILES", info->files(), fp); - _pacman_localdb_write_stringlist("BACKUP", info->backup, fp); + _pacman_localdb_write_stringlist("BACKUP", info->backup(), fp); fclose(fp); fp = NULL; } diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index 30e0077..47691d8 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -241,7 +241,7 @@ int _pacman_localdb_files_fread(Package *info, FILE *fp) } } else if(!strcmp(line, "%BACKUP%")) { while(fgets(line, sline, fp) && !_pacman_strempty(f_strtrim(line))) { - info->backup = f_stringlist_append(info->backup, line); + info->m_backup = f_stringlist_append(info->m_backup, line); } } } diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 209f308..390a645 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -94,7 +94,7 @@ Package::Package(const libpacman::Package &other) m_requiredby = _pacman_list_strdup(other.m_requiredby); m_conflicts = _pacman_list_strdup(other.m_conflicts); m_files = _pacman_list_strdup(other.m_files); - backup = _pacman_list_strdup(other.backup); + m_backup = _pacman_list_strdup(other.m_backup); m_depends = _pacman_list_strdup(other.m_depends); m_removes = _pacman_list_strdup(other.m_removes); m_groups = _pacman_list_strdup(other.m_groups); @@ -112,7 +112,7 @@ Package::~Package() FREELIST(license); FREELIST(desc_localized); FREELIST(m_files); - FREELIST(backup); + FREELIST(m_backup); FREELIST(m_depends); FREELIST(m_removes); FREELIST(m_conflicts); @@ -403,7 +403,7 @@ char *Package::fileneedbackup(const char *file) const ASSERT(!_pacman_strempty(file), RET_ERR(PM_ERR_WRONG_ARGS, NULL)); /* run through the backup list and parse out the md5 or sha1 hash for our file */ - for(lp = backup; lp; lp = lp->next) { + for(lp = m_backup; lp; lp = lp->next) { char *str = strdup(lp->data); char *ptr; @@ -479,7 +479,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((flags & PM_PACKAGE_FLAG_REPLACES) && f_stringlist_any_match(pkg->replaces(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_GROUPS) && f_stringlist_any_match(pkg->groups(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_FILES) && f_stringlist_any_match(pkg->files(), strmatcher)) || - ((flags & PM_PACKAGE_FLAG_BACKUP) && f_stringlist_any_match(pkg->backup, strmatcher)) || + ((flags & PM_PACKAGE_FLAG_BACKUP) && f_stringlist_any_match(pkg->backup(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_DEPENDS) && f_stringlist_any_match(pkg->depends(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_REMOVES) && f_stringlist_any_match(pkg->removes(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_REQUIREDBY) && f_stringlist_any_match(pkg->requiredby(), strmatcher)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 716e030..cf4c388 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -145,7 +145,7 @@ public: FStringList *m_replaces; FStringList *m_groups; FStringList *m_files; - FStringList *backup; + FStringList *m_backup; FStringList *m_depends; FStringList *m_removes; FStringList *m_requiredby; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index c66e91b..42c6149 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -122,7 +122,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) } else if(!strcmp(key, "PROVIDES")) { info->m_provides = f_stringlist_append(info->m_provides, ptr); } else if(!strcmp(key, "BACKUP")) { - info->backup = f_stringlist_append(info->backup, ptr); + info->m_backup = f_stringlist_append(info->m_backup, ptr); } else if(!strcmp(key, "TRIGGER")) { info->triggers = f_stringlist_append(info->triggers, ptr); } else { diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index 708eea1..5633d3e 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -19,6 +19,7 @@ * USA. */ +LIBPACMAN_PACKAGE_PROPERTY(FStringList *, backup, BACKUP ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, conflicts, CONFLICTS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, depends, DEPENDS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, files, FILES ) diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 40fa7fc..17d775a 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -876,7 +876,7 @@ void *pacman_pkg_getinfo(pmpkg_t *_pkg, unsigned char parm) case PM_PKG_PROVIDES: data = pkg->provides(); break; case PM_PKG_CONFLICTS: data = pkg->conflicts(); break; case PM_PKG_FILES: data = pkg->files(); break; - case PM_PKG_BACKUP: data = pkg->backup; break; + case PM_PKG_BACKUP: data = pkg->backup(); break; case PM_PKG_SCRIPLET: data = (void *)(long)pkg->scriptlet; break; case PM_PKG_DATA: data = pkg->data; break; case PM_PKG_TRIGGERS: data = pkg->triggers; break; diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index a3f5245..55fa377 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -745,7 +745,7 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran notouch = 1; } else { if(type == PM_TRANS_TYPE_ADD || oldpkg == NULL) { - nb = _pacman_list_is_strin(pathname, pkg->backup); + nb = _pacman_list_is_strin(pathname, pkg->backup()); } else { /* op == PM_TRANS_TYPE_UPGRADE */ hash_orig = oldpkg->fileneedbackup(pathname); @@ -785,7 +785,7 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran /* append the new md5 or sha1 hash to it's respective entry in pkg->backup * (it will be the new orginal) */ - for(lp = pkg->backup; lp; lp = lp->next) { + for(lp = pkg->backup(); lp; lp = lp->next) { char *fn; char *file = lp->data; @@ -915,7 +915,7 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran errors++; } /* calculate an md5 or sha1 hash if this is in pkg->backup */ - for(lp = pkg->backup; lp; lp = lp->next) { + for(lp = pkg->backup(); lp; lp = lp->next) { char *fn, *md5, *sha1; char path[PATH_MAX]; char *file = lp->data; @@ -1099,7 +1099,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) _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); + oldpkg->m_backup = _pacman_list_strdup(pkg_local->m_backup); strncpy(oldpkg->m_name, pkg_local->name(), PKG_NAME_LEN); strncpy(oldpkg->m_version, pkg_local->version(), PKG_VERSION_LEN); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
