Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e68590e25aaebf9bdaac01e17744bd366bed2839
commit e68590e25aaebf9bdaac01e17744bd366bed2839
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Nov 18 22:24:12 2013 +0100
libpacman: Modify conditions checks for empty transaction.
diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
index a00b5df..83bb12c 100644
--- a/lib/libpacman/add.c
+++ b/lib/libpacman/add.c
@@ -265,10 +265,6 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data)
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
- if(_pacman_list_empty(trans->packages)) {
- return(0);
- }
-
for(targ = trans->packages; targ; targ = targ->next) {
unsigned short pmo_upgrade;
char pm_install[PATH_MAX];
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index 7428bdb..840f989 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -284,7 +284,8 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t **data)
*data = NULL;
/* If there's nothing to do, return without complaining */
- if(_pacman_list_empty(trans->packages)) {
+ if(_pacman_list_empty(trans->packages) &&
+ _pacman_list_empty(trans->syncpkgs)) {
return(0);
}
@@ -311,7 +312,8 @@ int _pacman_trans_commit(pmtrans_t *trans, pmlist_t **data)
*data = NULL;
/* If there's nothing to do, return without complaining */
- if(_pacman_list_empty(trans->packages)) {
+ if(_pacman_list_empty(trans->packages) &&
+ _pacman_list_empty(trans->syncpkgs)) {
return(0);
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
