Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=897524c8c84717dcf0d24314d79429dce4147142

commit 897524c8c84717dcf0d24314d79429dce4147142
Author: Michel Hermier <[email protected]>
Date:   Wed Sep 17 08:06:18 2014 +0200

libpacman: When adding a pmsyncpkg_t to the transaction also automagically add 
the correct package to the packages member variable.

diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp
index 22e9da8..14219ec 100644
--- a/lib/libpacman/deps.cpp
+++ b/lib/libpacman/deps.cpp
@@ -279,7 +279,7 @@ FPtrList _pacman_checkdeps(pmtrans_t *trans, unsigned char 
op, const FPtrList &p
for(auto k = trans->syncpkgs.begin(), k_end = trans->syncpkgs.end(); !found && 
k != k_end; ++k) {
pmsyncpkg_t *ps = *k;

-                                                       
if(ps->pkg_new->provides(pkg_local->name())) {
+                                                       if(ps->pkg_new != NULL 
&& ps->pkg_new->provides(pkg_local->name())) {
found = true;
}
}
diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp
index 8d1c1e0..b8fbf46 100644
--- a/lib/libpacman/trans.cpp
+++ b/lib/libpacman/trans.cpp
@@ -112,10 +112,14 @@ int _pacman_trans_compute_triggers(pmtrans_t *trans)
trans->triggers.add(pkg->triggers());
}
for(auto lp = trans->syncpkgs.begin(), end = trans->syncpkgs.end(); lp != end; 
++lp) {
-               Package *pkg = ((pmsyncpkg_t *)*lp)->pkg_new;
+               pmsyncpkg_t *ps = *lp;

-               /* FIXME: might be incomplete */
-               trans->triggers.add(pkg->triggers());
+               if(ps->pkg_new != NULL) {
+                       trans->triggers.add(ps->pkg_new->triggers());
+               }
+               if(ps->pkg_local != NULL) {
+                       trans->triggers.add(ps->pkg_local->triggers());
+               }
}
_pacman_list_remove_dupes(&trans->triggers);
/* FIXME: Sort the triggers to have a predictable execution order */
@@ -245,6 +249,16 @@ pmsyncpkg_t *__pmtrans_t::add(pmsyncpkg_t *syncpkg, int 
flags)
}
_pacman_log(PM_LOG_FLOW2, _("adding target '%s' to the transaction set"), 
syncpkg->pkg_name);
syncpkgs.add(syncpkg);
+
+       switch(syncpkg->type) {
+       case PM_TRANS_TYPE_ADD:
+       case PM_TRANS_TYPE_UPGRADE:
+               packages.add(syncpkg->pkg_new);
+               break;
+       case PM_TRANS_TYPE_REMOVE:
+               packages.add(syncpkg->pkg_local);
+       }
+
return syncpkg;
}

@@ -418,8 +432,6 @@ int __pmtrans_t::add(const char *target, pmtranstype_t 
type, int flags)
}
fRelease(pkg_new);
return 0;
-                       } else {
-                               add(pkg_new, type, 0);
}
}
if(type == PM_TRANS_TYPE_REMOVE) {
@@ -440,7 +452,6 @@ int __pmtrans_t::add(const char *target, pmtranstype_t 
type, int flags)
RET_ERR(PM_ERR_PKG_HOLD, -1);
}
}
-                       return add(pkg_local, type, 0);
}
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to