emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-bin: while updating a package that needs a new dependent package

Browse Source 
the automatic-install object wasn't set correctly, fix this.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091022123221-46rya21xjy1mp8nb
This commit is contained in:
Juan RP 2009-10-22 14:32:21 +02:00
parent d2dc018fcc
commit 96c501b5cc
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/xbps-bin/install.c
View File

@ -385,14 +385,14 @@ exec_transaction(struct transaction *trans)
prop_object_iterator_t replaces_iter; prop_object_iterator_t replaces_iter;
const char *pkgname, *version, *instver, *filename, *tract; const char *pkgname, *version, *instver, *filename, *tract;
int rv = 0; int rv = 0;
bool essential, isdep, autoinst; bool essential, autoinst;
pkg_state_t state = 0; pkg_state_t state = 0;
assert(trans != NULL); assert(trans != NULL);
assert(trans->dict != NULL); assert(trans->dict != NULL);
assert(trans->iter != NULL); assert(trans->iter != NULL);
essential = isdep = autoinst = false; essential = autoinst = false;
/* /*
* Show download/installed size for the transaction. * Show download/installed size for the transaction.
*/ */
@ -427,9 +427,17 @@ exec_transaction(struct transaction *trans)
prop_dictionary_get_cstring_nocopy(obj, "trans-action", &tract); prop_dictionary_get_cstring_nocopy(obj, "trans-action", &tract);
replaces_iter = xbps_get_array_iter_from_dict(obj, "replaces"); replaces_iter = xbps_get_array_iter_from_dict(obj, "replaces");
/*
* Set automatic-install bool if we are updating all packages,
* and a new package is going to be installed, and
* if we updating a package required new updating dependent
* packages.
*/
if (trans->originpkgname && if (trans->originpkgname &&
strcmp(trans->originpkgname, pkgname)) strcmp(trans->originpkgname, pkgname))
isdep = true; autoinst = true;
else if (!trans->originpkgname && strcmp(tract, "install") == 0)
autoinst = true;
/* /*
* If dependency is already unpacked skip this phase. * If dependency is already unpacked skip this phase.
@ -467,7 +475,6 @@ exec_transaction(struct transaction *trans)
autoinst = false; autoinst = false;
prop_dictionary_get_bool(instpkgd, "automatic-install", prop_dictionary_get_bool(instpkgd, "automatic-install",
&autoinst); &autoinst);
isdep = autoinst;
prop_object_release(instpkgd); prop_object_release(instpkgd);
/* /*
@ -507,12 +514,12 @@ exec_transaction(struct transaction *trans)
/* /*
* Register binary package. * Register binary package.
*/ */
if ((rv = xbps_register_pkg(obj, isdep)) != 0) { if ((rv = xbps_register_pkg(obj, autoinst)) != 0) {
printf("error: registering %s-%s! (%s)\n", printf("error: registering %s-%s! (%s)\n",
pkgname, version, strerror(rv)); pkgname, version, strerror(rv));
return rv; return rv;
} }
isdep = false; autoinst = false;
/* /*
* Set package state to unpacked in the transaction * Set package state to unpacked in the transaction
* dictionary. * dictionary.