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

Do not configure pkg if there's an update in transaction.

Browse Source 
This fixes the following problem:

 - pkg is installed with state "unpacked".
 - There's an update of pkg in transaction.
 - xbps tries to configure the pkg because its state is "unpacked",
   therefore ignoring the update.
This commit is contained in:
Juan RP 2012-12-20 12:08:55 +01:00
parent cf1c42a109
commit 9489f8a3dc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -1,5 +1,10 @@
xbps-0.19.1 (???): xbps-0.19.1 (???):
* libxbps: when a package has not been configured and there's an update
in transaction, libxbps incorrectly tried to ignore the update and
configure this package. Fix this by not ignoring the update even if
package has any state.
* xbps-query(8): -l, --list-packages option now prints pkg state as follows: * xbps-query(8): -l, --list-packages option now prints pkg state as follows:
STATE PKGVER DESCRIPTION STATE PKGVER DESCRIPTION

2
lib/transaction_ops.c
View File

@ -145,7 +145,7 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, int action)
if ((rv = xbps_set_pkg_state_dictionary(pkg_repod, state)) != 0) if ((rv = xbps_set_pkg_state_dictionary(pkg_repod, state)) != 0)
return rv; return rv;
if (state == XBPS_PKG_STATE_UNPACKED) if ((action == TRANS_INSTALL) && (state == XBPS_PKG_STATE_UNPACKED))
reason = "configure"; reason = "configure";
else if (state == XBPS_PKG_STATE_NOT_INSTALLED) else if (state == XBPS_PKG_STATE_NOT_INSTALLED)
reason = "install"; reason = "install";