Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ee21152035eae63814a6e598a5f10c13e9ffc293
commit ee21152035eae63814a6e598a5f10c13e9ffc293 Author: Michel Hermier <[email protected]> Date: Mon May 12 22:25:57 2014 +0200 libpacman: Simplify code around a _pacman_runscriptlet call in __pmtrans_t::commit. diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 580fcfe..a29d87c 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1986,42 +1986,36 @@ int __pmtrans_t::commit(pmlist_t **data) strncpy(oldpkg->m_name, pkg_local->name(), PKG_NAME_LEN); strncpy(oldpkg->m_version, pkg_local->version(), PKG_VERSION_LEN); } - - /* pre_upgrade scriptlet */ - if(pkg_new->scriptlet && !(flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _pacman_runscriptlet(handle->root, pkg_new->data, trans_event_table[type].pre.hook, pkg_new->version(), oldpkg ? oldpkg->version() : NULL, - this); - } - - if(oldpkg) { - pmtrans_t *tr; - pmtrans_cbs_t null_cbs = { NULL }; - - _pacman_log(PM_LOG_FLOW1, _("removing old package first (%s-%s)"), oldpkg->name(), oldpkg->version()); - tr = new __pmtrans_t(PM_TRANS_TYPE_UPGRADE, flags, null_cbs); - if(tr == NULL) { - RET_ERR(PM_ERR_TRANS_ABORT, -1); - } - if(_pacman_remove_addtarget(tr, pkg_new->name()) == -1) { - delete tr; - RET_ERR(PM_ERR_TRANS_ABORT, -1); - } - /* copy the skiplist over */ - tr->skiplist = _pacman_list_strdup(skiplist); - if(_pacman_remove_commit(tr, NULL) == -1) { - delete tr; - RET_ERR(PM_ERR_TRANS_ABORT, -1); - } - delete tr; - } - _pacman_log(PM_LOG_FLOW1, _("adding new package %s-%s"), pkg_new->name(), pkg_new->version()); } else { _pacman_log(PM_LOG_FLOW1, _("adding package %s-%s"), pkg_new->name(), pkg_new->version()); + } + + if(pkg_new->scriptlet && !(flags & PM_TRANS_FLAG_NOSCRIPTLET)) { + _pacman_runscriptlet(handle->root, pkg_new->data, trans_event_table[type].pre.hook, pkg_new->version(), oldpkg ? oldpkg->version() : NULL, this); + } + + if(oldpkg) { + pmtrans_t *tr; + pmtrans_cbs_t null_cbs = { NULL }; - /* pre_install scriptlet */ - if(pkg_new->scriptlet && !(flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _pacman_runscriptlet(handle->root, pkg_new->data, trans_event_table[type].pre.hook, pkg_new->version(), NULL, this); + _pacman_log(PM_LOG_FLOW1, _("removing old package first (%s-%s)"), oldpkg->name(), oldpkg->version()); + tr = new __pmtrans_t(PM_TRANS_TYPE_UPGRADE, flags, null_cbs); + if(tr == NULL) { + RET_ERR(PM_ERR_TRANS_ABORT, -1); } + if(_pacman_remove_addtarget(tr, pkg_new->name()) == -1) { + delete tr; + RET_ERR(PM_ERR_TRANS_ABORT, -1); + } + /* copy the skiplist over */ + tr->skiplist = _pacman_list_strdup(skiplist); + if(_pacman_remove_commit(tr, NULL) == -1) { + delete tr; + RET_ERR(PM_ERR_TRANS_ABORT, -1); + } + delete tr; + + _pacman_log(PM_LOG_FLOW1, _("adding new package %s-%s"), pkg_new->name(), pkg_new->version()); } if(!(this->flags & PM_TRANS_FLAG_DBONLY)) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
