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

Remove another transaction obj from pkgdb and make xbps-pkgdb catch it.

Browse Source
This commit is contained in:
Juan RP 2013-02-07 17:49:28 +01:00
parent 569976888d
commit 178a6b58ae
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/xbps-pkgdb/check_pkg_unneeded.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2012 Juan Romero Pardines. * Copyright (c) 2013 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -56,5 +56,8 @@ check_pkg_unneeded(struct xbps_handle *xhp, const char *pkgname, void *arg)
if (prop_dictionary_get(pkgd, "transaction")) if (prop_dictionary_get(pkgd, "transaction"))
prop_dictionary_remove(pkgd, "transaction"); prop_dictionary_remove(pkgd, "transaction");
if (prop_dictionary_get(pkgd, "skip-obsoletes"))
prop_dictionary_remove(pkgd, "skip-obsoletes");
return 0; return 0;
} }

2
include/xbps_api.h.in
View File

@ -64,7 +64,7 @@
*/ */
#define XBPS_PKGINDEX_VERSION "1.6" #define XBPS_PKGINDEX_VERSION "1.6"
#define XBPS_API_VERSION "20130205" #define XBPS_API_VERSION "20130207"
#ifndef XBPS_VERSION #ifndef XBPS_VERSION
#define XBPS_VERSION "UNSET" #define XBPS_VERSION "UNSET"

1
lib/package_register.c
View File

@ -161,6 +161,7 @@ xbps_register_pkg(struct xbps_handle *xhp, prop_dictionary_t pkgrd, bool flush)
*/ */
prop_dictionary_remove(pkgd, "remove-and-update"); prop_dictionary_remove(pkgd, "remove-and-update");
prop_dictionary_remove(pkgd, "transaction"); prop_dictionary_remove(pkgd, "transaction");
prop_dictionary_remove(pkgd, "skip-obsoletes");
if (!xbps_pkgdb_replace_pkg(xhp, pkgd, pkgname, flush)) { if (!xbps_pkgdb_replace_pkg(xhp, pkgd, pkgname, flush)) {
xbps_dbg_printf(xhp, xbps_dbg_printf(xhp,