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

Revert code to update xbps independently; I'll use another way to implement this.

Browse Source
This commit is contained in:
Juan RP 2013-03-08 09:44:57 +01:00
parent f5f6f50e27
commit 50ea03df2a
4 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -11,11 +11,6 @@ xbps-0.21 (???):
glibc>=2.8_1 glibc>=2.8_1
$ $
* When running a full system upgrade (xbps-install -u) check if there's
any update to the xbps package, and if true, update this only in
the running transaction. This ensures that we update the package
manager without any trouble in pkgdb.
* New repository index format (1.7): unnecessary and redundant objects * New repository index format (1.7): unnecessary and redundant objects
have been removed that are already stored in package metadata files. have been removed that are already stored in package metadata files.
This means that xbps-query(8) in repository mode will now fetch package This means that xbps-query(8) in repository mode will now fetch package

1
bin/xbps-install/state_cb.c
View File

@ -76,7 +76,6 @@ state_cb(struct xbps_state_cb_data *xscd, void *cbdata)
case XBPS_STATE_CONFIGURE: case XBPS_STATE_CONFIGURE:
printf("%s: configuring ...\n", xscd->arg); printf("%s: configuring ...\n", xscd->arg);
break; break;
case XBPS_STATE_XBPS_UPDATE:
case XBPS_STATE_CONFIGURE_DONE: case XBPS_STATE_CONFIGURE_DONE:
/* empty */ /* empty */
break; break;

5
include/xbps_api.h.in
View File

@ -48,7 +48,7 @@
*/ */
#define XBPS_PKGINDEX_VERSION "1.7" #define XBPS_PKGINDEX_VERSION "1.7"
#define XBPS_API_VERSION "20130307-2" #define XBPS_API_VERSION "20130308"
#ifndef XBPS_VERSION #ifndef XBPS_VERSION
#define XBPS_VERSION "UNSET" #define XBPS_VERSION "UNSET"
@ -210,7 +210,6 @@ extern "C" {
* install, update, remove and replace. * install, update, remove and replace.
* - XBPS_STATE_TRANS_CONFIGURE: transaction is configuring all * - XBPS_STATE_TRANS_CONFIGURE: transaction is configuring all
* unpacked packages. * unpacked packages.
* - XBPS_STATE_XBPS_UPDATE: a new package update is available for XBPS.
* - XBPS_STATE_DOWNLOAD: a binary package is being downloaded. * - XBPS_STATE_DOWNLOAD: a binary package is being downloaded.
* - XBPS_STATE_VERIFY: a binary package is being verified. * - XBPS_STATE_VERIFY: a binary package is being verified.
* - XBPS_STATE_REMOVE: a package is being removed. * - XBPS_STATE_REMOVE: a package is being removed.
@ -278,7 +277,6 @@ typedef enum xbps_state {
XBPS_STATE_UPDATE_FAIL, XBPS_STATE_UPDATE_FAIL,
XBPS_STATE_UNPACK_FAIL, XBPS_STATE_UNPACK_FAIL,
XBPS_STATE_REPOSYNC_FAIL, XBPS_STATE_REPOSYNC_FAIL,
XBPS_STATE_XBPS_UPDATE,
XBPS_STATE_CONFIGURE_DONE XBPS_STATE_CONFIGURE_DONE
} xbps_state_t; } xbps_state_t;
@ -577,7 +575,6 @@ struct xbps_handle {
* - XBPS_FLAG_DEBUG * - XBPS_FLAG_DEBUG
* - XBPS_FLAG_SYSLOG * - XBPS_FLAG_SYSLOG
* - XBPS_FLAG_INSTALL_AUTO * - XBPS_FLAG_INSTALL_AUTO
* - XBPS_FLAG_INSTALL_MANUAL
*/ */
int flags; int flags;
/** /**

17
lib/transaction_ops.c
View File

@ -201,23 +201,6 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
iter = prop_dictionary_iterator(xhp->pkgdb); iter = prop_dictionary_iterator(xhp->pkgdb);
assert(iter); assert(iter);
/*
* Check if there's a new update for XBPS before starting
* a full system upgrade.
*/
if (xbps_pkgdb_get_pkg(xhp, "xbps")) {
if (trans_find_pkg(xhp, "xbps", TRANS_UPDATE) == 0) {
xbps_set_cb_state(xhp, XBPS_STATE_XBPS_UPDATE, 0, NULL, NULL);
return 0;
}
}
if (xbps_pkgdb_get_pkg(xhp, "xbps-git")) {
if (trans_find_pkg(xhp, "xbps-git", TRANS_UPDATE) == 0) {
xbps_set_cb_state(xhp, XBPS_STATE_XBPS_UPDATE, 0, NULL, NULL);
return 0;
}
}
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
pkgd = prop_dictionary_get_keysym(xhp->pkgdb, obj); pkgd = prop_dictionary_get_keysym(xhp->pkgdb, obj);
prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);